Eric a94211d3d3 Merge remote-tracking branch 'origin/develop' into feature/b931 ...

# Conflicts:
#	.idea/inspectionProfiles/Combodo.xml
#	application/cmdbabstract.class.inc.php
#	core/attributedef.class.inc.php
#	css/light-grey.css
#	css/light-grey.scss

2018-09-25 12:03:44 +02:00

..

ajax.csvimport.php

N°583 CSV Import now supports friendlynames as reconciliation keys. More over, read-only attributes (friendlyname, obsolescence flag, ...) are forced to reconciliation scheme.

2017-08-17 09:51:38 +00:00

ajax.document.php

Proper use of the "304" (Not modified) HTTP header for InlineImages. Seems that FastCGI is more sensitive to incorrect HTTP headers than MPM...

2018-06-05 12:59:17 +00:00

ajax.render.php

Updated jQuery to v3.3.1

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

ajax.searchform.php

advanced search - merged commit (since sourceforge has lost our commit, this is a manual merge all all losts)

2018-04-12 12:29:32 +00:00

audit.php

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

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

csvimport.php

N°1328 Fix CSV import : check if user has rights on imported class

2018-04-03 13:36:27 +00:00

exec.php

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

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

graphviz.php

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

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

index.php

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

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

logoff.php

#765: prevent two persons to edit the same object at the same time.

2015-07-02 15:40:39 +00:00

navigator.php

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

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

notifications.php

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

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

opensearch.xml.php

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

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

preferences.php

Updated jQuery to v3.3.1

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

run_query.php

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

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

schema.php

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

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

tagadmin.php

N°931: Rename Tag columns in database

2018-09-20 09:58:35 +02:00

UI.php

N°1636 Fix concurrent lock not released on failed transition (in the console)

2018-09-19 15:56:50 +02:00

UniversalSearch.php

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

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