Eric
|
7c1a8c90da
|
N°2595 - Reorganize/rename admin. console menus
|
2019-12-11 13:59:31 +01:00 |
|
Pierre Goiffon
|
616c1b9b73
|
🔧 Update PhpStorm formatter
|
2019-06-07 15:21:59 +02:00 |
|
Pierre Goiffon
|
21c5638e1e
|
Merge branch 'support/2.5' into develop
# 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
|
2018-10-18 14:34:22 +02:00 |
|
Pierre Goiffon
|
80be4b4371
|
idea files improvements
- use Combodo preset
- JS code style (use tab for indentation, newlines in if/else statements)
|
2018-10-09 18:01:31 +02:00 |
|
Eric
|
e9ecd89cda
|
Code cleanup
|
2018-09-24 13:57:45 +02:00 |
|
Eric
|
55036511ab
|
longer lines for PHP code format
|
2018-09-24 11:48:15 +02:00 |
|
Pierre Goiffon
|
c87f001956
|
Little modifications on PHPStorm code style & inspections
|
2018-09-11 18:44:44 +02:00 |
|
Pierre Goiffon
|
64438f6b6d
|
idea : change XML indent
|
2018-09-06 18:35:51 +02:00 |
|
bruno DA SILVA
|
7ac0e50bd9
|
phpstorm's line separator in edited files
|
2018-09-03 17:36:37 +02:00 |
|
Molkobain
|
9ad8c6a96d
|
Add .idea project files
|
2018-09-03 15:53:00 +02:00 |
|
Pierre Goiffon
|
fc0e5ecd3b
|
Ignore : add other shared files in index
|
2018-08-31 17:46:12 +02:00 |
|