Pierre Goiffon f871581997 Merge branch 'develop' into feature/b931 ...

# Conflicts:
#	application/applicationextension.inc.php
#	core/attributedef.class.inc.php
#	core/cmdbchangeop.class.inc.php
#	core/cmdbobject.class.inc.php
#	core/dbobjectsearch.class.php
#	core/oql/expression.class.inc.php
#	core/oql/oql-lexer.plex
#	core/oql/oql-parser.y
#	core/oql/oqlquery.class.inc.php
#	css/light-grey.scss
#	datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml
#	datamodels/2.x/itop-portal/datamodel.itop-portal.xml
#	datamodels/2.x/itop-tickets/en.dict.itop-tickets.php
#	dictionaries/en.dictionary.itop.core.php
#	dictionaries/fr.dictionary.itop.core.php
#	setup/xmldataloader.class.inc.php
#	test/ItopDataTestCase.php

2018-09-04 18:02:51 +02:00

..

compat

Code cleanup

2018-05-14 07:41:51 +00:00

install

#960 [RPM Packaging] Adjust line endings in READ and LICENSE files

2014-07-15 09:21:47 +00:00

licenses

Update licences copyright

2018-03-06 14:06:19 +00:00

packaging/rpm

#960 [RPM Packaging] Adjust line endings in READ and LICENSE files

2014-07-15 09:21:47 +00:00

ajax.dataloader.php

Fix files using CrLf, convert them to Lf to have the whole repo using Lf

2018-09-04 17:59:51 +02:00

applicationinstaller.class.inc.php

N°1173 : mysqldump now correctly use 'mysql_bindir' parameter on setup & move to prod's backups

2018-05-03 15:00:13 +00:00

backup.class.inc.php

Retrofit from trunk

2018-08-28 12:14:56 +00:00

compiler.class.inc.php

N°962: TagSet - Attribute definition (continued)

2018-08-30 11:08:47 +02:00

email.test.php

Fix files using CrLf, convert them to Lf to have the whole repo using Lf

2018-09-04 17:59:51 +02:00

exclude.txt

First step toward a generic Linux packaging supporting both DEBs and RPMs...

2013-12-03 11:04:33 +00:00

extensionsmap.class.inc.php

Officially support PHP 7.2.0.

2018-06-15 16:37:11 +00:00

index.php

#1297: timezone configuration setting was inoperant.

2016-08-29 12:47:06 +00:00

itop_design.xsd

Compiler and co: improved the robustness of xml datamodel

2012-04-18 14:57:57 +00:00

itopdesignformat.class.inc.php

N°931 Change default XML version and remove done TODOs

2018-08-30 11:08:46 +02:00

jquery.progression.js

Moved under "trunk" to be able to track releases under "tags"

2009-04-28 09:03:12 +00:00

modelfactory.class.inc.php

Code cleanup

2018-05-14 07:41:51 +00:00

modulediscovery.class.inc.php

Fix files using CrLf, convert them to Lf to have the whole repo using Lf

2018-09-04 17:59:51 +02:00

moduleinstallation.class.inc.php

Fix files using CrLf, convert them to Lf to have the whole repo using Lf

2018-09-04 17:59:51 +02:00

moduleinstaller.class.inc.php

Fix files using CrLf, convert them to Lf to have the whole repo using Lf

2018-09-04 17:59:51 +02:00

orange-progress.gif

Moved under "trunk" to be able to track releases under "tags"

2009-04-28 09:03:12 +00:00

parameters.class.inc.php

Setup: Display the XML errors on the screen

2018-04-20 15:56:53 +00:00

phpinfo.php

For support purposes: added a page that simply calls phpinfo()

2010-09-14 08:43:30 +00:00

runtimeenv.class.inc.php

Fix files using CrLf, convert them to Lf to have the whole repo using Lf

2018-09-04 17:59:51 +02:00

setup.js

Updated jQuery to v3.3.1

2018-07-23 06:58:30 +00:00

setuppage.class.inc.php

Fix files using CrLf, convert them to Lf to have the whole repo using Lf

2018-09-04 17:59:51 +02:00

setuputils.class.inc.php

SetupUtils : update comments to match current branch version

2018-09-04 12:02:16 +02:00

tar.php

Fix files using CrLf, convert them to Lf to have the whole repo using Lf

2018-09-04 17:59:51 +02:00

wizardcontroller.class.inc.php

Updated jQuery to v3.3.1

2018-07-23 06:58:30 +00:00

wizardsteps.class.inc.php

Updated jQuery to v3.3.1

2018-07-23 06:58:30 +00:00

xmldataloader.class.inc.php

Merge branch 'develop' into feature/b931

2018-09-04 18:02:51 +02:00