mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-13 15:34:12 +01:00
21c5638e1e
# Conflicts: # application/applicationextension.inc.php # application/dashlet.class.inc.php # application/itopwebpage.class.inc.php # application/loginwebpage.class.inc.php # application/menunode.class.inc.php # application/nicewebpage.class.inc.php # application/query.class.inc.php # application/utils.inc.php # application/webpage.class.inc.php # application/wizardhelper.class.inc.php # core/action.class.inc.php # core/attributedef.class.inc.php # core/cmdbchangeop.class.inc.php # core/cmdbobject.class.inc.php # core/cmdbsource.class.inc.php # core/config.class.inc.php # core/dbobject.class.php # core/dbobjectsearch.class.php # core/dbobjectset.class.php # core/kpi.class.inc.php # core/modelreflection.class.inc.php # core/modulehandler.class.inc.php # core/oql/expression.class.inc.php # core/oql/oql-lexer.plex # core/oql/oql-parser.y # core/oql/oqlquery.class.inc.php # core/ormpassword.class.inc.php # core/sqlobjectquery.class.inc.php # core/sqlquery.class.inc.php # core/sqlunionquery.class.inc.php # core/trigger.class.inc.php # core/userrights.class.inc.php # css/light-grey.scss # datamodels/2.x/itop-backup/status.php # datamodels/2.x/itop-config/config.php # datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml # datamodels/2.x/itop-knownerror-mgmt/en.dict.itop-knownerror-mgmt.php # datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php # datamodels/2.x/itop-portal-base/portal/src/controllers/abstractcontroller.class.inc.php # datamodels/2.x/itop-portal-base/portal/src/controllers/brickcontroller.class.inc.php # datamodels/2.x/itop-portal-base/portal/src/controllers/browsebrickcontroller.class.inc.php # datamodels/2.x/itop-portal-base/portal/src/controllers/createbrickcontroller.class.inc.php # datamodels/2.x/itop-portal-base/portal/src/controllers/defaultcontroller.class.inc.php # datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php # datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php # datamodels/2.x/itop-portal-base/portal/src/controllers/userprofilebrickcontroller.class.inc.php # datamodels/2.x/itop-portal-base/portal/src/routers/abstractrouter.class.inc.php # datamodels/2.x/itop-portal-base/portal/src/routers/browsebrickrouter.class.inc.php # datamodels/2.x/itop-portal-base/portal/src/routers/createbrickrouter.class.inc.php # datamodels/2.x/itop-portal-base/portal/src/routers/defaultrouter.class.inc.php # datamodels/2.x/itop-portal-base/portal/src/routers/managebrickrouter.class.inc.php # datamodels/2.x/itop-portal-base/portal/src/routers/objectrouter.class.inc.php # datamodels/2.x/itop-portal-base/portal/src/routers/userprofilebrickrouter.class.inc.php # datamodels/2.x/itop-portal/datamodel.itop-portal.xml # datamodels/2.x/itop-tickets/en.dict.itop-tickets.php # dictionaries/da.dictionary.itop.core.php # dictionaries/da.dictionary.itop.ui.php # dictionaries/en.dictionary.itop.core.php # dictionaries/en.dictionary.itop.ui.php # dictionaries/fr.dictionary.itop.core.php # dictionaries/hu.dictionary.itop.core.php # dictionaries/it.dictionary.itop.core.php # dictionaries/nl.dictionary.itop.core.php # dictionaries/pt_br.dictionary.itop.core.php # dictionaries/tr.dictionary.itop.core.php # dictionaries/zh.dictionary.itop.core.php # js/forms-json-utils.js # js/jquery-migrate-1.4.1.min.js # js/jquery.layout.js # js/jquery.layout.min.js # js/jquery.tablesorter.pager.js # js/linkswidget.js # js/searchformforeignkeys.js # js/utils.js # js/wizardhelper.js # pages/schema.php # readme.txt # setup/ajax.dataloader.php # setup/xmldataloader.class.inc.php # sources/renderer/bootstrap/fieldrenderer/bssubformfieldrenderer.class.inc.php # sources/renderer/console/consoleformrenderer.class.inc.php # sources/renderer/console/fieldrenderer/consoleselectobjectfieldrenderer.class.inc.php # sources/renderer/console/fieldrenderer/consolesimplefieldrenderer.class.inc.php # sources/renderer/console/fieldrenderer/consolesubformfieldrenderer.class.inc.php # test/ItopDataTestCase.php # test/core/ormLinkSetTest.php # webservices/backoffice.dataloader.php # webservices/rest.php
57 lines
2.7 KiB
XML
57 lines
2.7 KiB
XML
<component name="ProjectCodeStyleConfiguration">
|
|
<code_scheme name="Project" version="173">
|
|
<option name="LINE_SEPARATOR" value=" " />
|
|
<option name="RIGHT_MARGIN" value="320" />
|
|
<HTMLCodeStyleSettings>
|
|
<option name="HTML_DO_NOT_INDENT_CHILDREN_OF" value="html,body,thead,tbody,tfoot,script,style" />
|
|
<option name="HTML_DO_NOT_ALIGN_CHILDREN_OF_MIN_LINES" value="4" />
|
|
</HTMLCodeStyleSettings>
|
|
<PHPCodeStyleSettings>
|
|
<option name="CONCAT_SPACES" value="false" />
|
|
<option name="PHPDOC_BLANK_LINE_BEFORE_TAGS" value="true" />
|
|
<option name="PHPDOC_BLANK_LINES_AROUND_PARAMETERS" value="true" />
|
|
<option name="PHPDOC_WRAP_LONG_LINES" value="true" />
|
|
<option name="LOWER_CASE_BOOLEAN_CONST" value="true" />
|
|
<option name="LOWER_CASE_NULL_CONST" value="true" />
|
|
<option name="BLANK_LINES_BEFORE_RETURN_STATEMENT" value="1" />
|
|
<option name="KEEP_RPAREN_AND_LBRACE_ON_ONE_LINE" value="true" />
|
|
<option name="PHPDOC_USE_FQCN" value="true" />
|
|
</PHPCodeStyleSettings>
|
|
<codeStyleSettings language="JavaScript">
|
|
<option name="BRACE_STYLE" value="2" />
|
|
<option name="ELSE_ON_NEW_LINE" value="true" />
|
|
<option name="IF_BRACE_FORCE" value="3" />
|
|
<indentOptions>
|
|
<option name="USE_TAB_CHARACTER" value="true" />
|
|
</indentOptions>
|
|
</codeStyleSettings>
|
|
<codeStyleSettings language="PHP">
|
|
<option name="RIGHT_MARGIN" value="320" />
|
|
<option name="BLANK_LINES_AFTER_PACKAGE" value="1" />
|
|
<option name="BRACE_STYLE" value="2" />
|
|
<option name="ELSE_ON_NEW_LINE" value="true" />
|
|
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
|
|
<option name="SPACE_BEFORE_FOR_PARENTHESES" value="false" />
|
|
<option name="CALL_PARAMETERS_WRAP" value="1" />
|
|
<option name="METHOD_PARAMETERS_WRAP" value="1" />
|
|
<option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
|
|
<option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
|
|
<option name="ARRAY_INITIALIZER_WRAP" value="5" />
|
|
<option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
|
|
<option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
|
|
<option name="IF_BRACE_FORCE" value="3" />
|
|
<option name="DOWHILE_BRACE_FORCE" value="3" />
|
|
<option name="WHILE_BRACE_FORCE" value="3" />
|
|
<option name="FOR_BRACE_FORCE" value="3" />
|
|
<indentOptions>
|
|
<option name="USE_TAB_CHARACTER" value="true" />
|
|
<option name="SMART_TABS" value="true" />
|
|
</indentOptions>
|
|
</codeStyleSettings>
|
|
<codeStyleSettings language="XML">
|
|
<indentOptions>
|
|
<option name="USE_TAB_CHARACTER" value="true" />
|
|
</indentOptions>
|
|
</codeStyleSettings>
|
|
</code_scheme>
|
|
</component> |