Pierre Goiffon 5309aa225a Merge remote-tracking branch 'origin/support/2.5' into release/2.6 ...

# Conflicts:
#	application/utils.inc.php
#	js/dashboard.js
#	pages/ajax.render.php

2018-11-26 18:28:42 +01: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

Merge remote-tracking branch 'origin/support/2.5' into release/2.6

2018-11-26 18:28:42 +01:00

ajax.searchform.php

N°1659 - Don't use anymore the current organization in the external key search (and n-n)

2018-11-15 17:07:31 +01:00

audit.php

Convert all files from CrLf to Lf (preparing merge to develop)

2018-10-18 14:20:40 +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

Convert all files from CrLf to Lf (preparing merge to develop)

2018-10-18 14:20:40 +02:00

graphviz.php

Convert all files from CrLf to Lf (preparing merge to develop)

2018-10-18 14:20:40 +02:00

index.php

Convert all files from CrLf to Lf (preparing merge to develop)

2018-10-18 14:20:40 +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

Convert all files from CrLf to Lf (preparing merge to develop)

2018-10-18 14:20:40 +02:00

notifications.php

Convert all files from CrLf to Lf (preparing merge to develop)

2018-10-18 14:20:40 +02:00

opensearch.xml.php

Convert all files from CrLf to Lf (preparing merge to develop)

2018-10-18 14:20:40 +02:00

preferences.php

iTop Newsroom implementation - painfully merged manually...

2018-11-21 19:36:51 +01:00

run_query.php

DBSearch: Fix serialization rework

2018-10-22 15:37:32 +02:00

schema.php

Convert all files from CrLf to Lf (preparing merge to develop)

2018-10-18 14:20:40 +02:00

tagadmin.php

Fix error on Tag Admin screen when no TagSet attribute is defined

2018-10-23 15:08:40 +02:00

UI.php

(cherry picked from 854bb81) N°1779 Fix none draggable columns in exports (Excel, CSV, ...)

2018-11-21 16:13:11 +01:00

UniversalSearch.php

Convert all files from CrLf to Lf (preparing merge to develop)

2018-10-18 14:20:40 +02:00