Stephen Abello ecc0b57b31 Merge branch 'master' into develop ...

# Conflicts:
#	css/css-variables.scss
#	css/light-grey.css
#	datamodels/2.x/authent-external/module.authent-external.php
#	datamodels/2.x/authent-ldap/module.authent-ldap.php
#	datamodels/2.x/authent-local/module.authent-local.php
#	datamodels/2.x/itop-attachments/module.attachments.php
#	datamodels/2.x/itop-backup/module.itop-backup.php
#	datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php
#	datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php
#	datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php
#	datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
#	datamodels/2.x/itop-config/module.itop-config.php
#	datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php
#	datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php
#	datamodels/2.x/itop-full-itil/module.itop-full-itil.php
#	datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php
#	datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php
#	datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
#	datamodels/2.x/itop-portal-base/module.itop-portal-base.php
#	datamodels/2.x/itop-portal/module.itop-portal.php
#	datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php
#	datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php
#	datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php
#	datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php
#	datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php
#	datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php
#	datamodels/2.x/itop-sla-computation/module.itop-sla-computation.php
#	datamodels/2.x/itop-storage-mgmt/module.itop-storage-mgmt.php
#	datamodels/2.x/itop-tickets/module.itop-tickets.php
#	datamodels/2.x/itop-virtualization-mgmt/module.itop-virtualization-mgmt.php
#	datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php
#	datamodels/2.x/version.xml

2020-01-20 16:42:42 +01:00

..

templates

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

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

ajaxwebpage.class.inc.php

PHPDoc

2020-01-15 08:42:35 +01:00

application.inc.php

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

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

applicationcontext.class.inc.php

N°1583 - No filter applied if only one org defined

2018-11-21 11:25:24 +01:00

applicationextension.inc.php

N°2293 - API OnDBUpdate and AfterUpdate need modified fields and previous data

2020-01-07 15:05:29 +01:00

audit.category.class.inc.php

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

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

audit.rule.class.inc.php

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

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

capturewebpage.class.inc.php

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

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

clipage.class.inc.php

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

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

cmdbabstract.class.inc.php

N°2313 - Markup extensibility: Add field label in its metadata

2020-01-20 14:43:40 +01:00

csvpage.class.inc.php

N°2529 Fix charset sent by logout page

2019-10-09 18:07:08 +02:00

dashboard.class.inc.php

N°2314 Introduce custom themes for iTop's console

2019-12-12 15:46:03 +01:00

dashboardlayout.class.inc.php

cleanup code

2018-10-15 16:37:16 +02:00

dashlet.class.inc.php

N°2349 fix GroupBy dashlet on classes with ExternalField to ExternalField

2019-07-05 12:10:04 +02:00

datamodel.application.xml

N°2595 - Reorganize/rename admin. console menus

2019-12-11 13:59:31 +01:00

datatable.class.inc.php

N°2314 Introduce custom themes for iTop's console

2019-12-12 15:46:03 +01:00

displayblock.class.inc.php

N°2314 Introduce custom themes for iTop's console

2019-12-12 15:46:03 +01:00

excelexporter.class.inc.php

N°1248 - User Management Portal

2018-01-30 15:17:51 +00:00

forms.class.inc.php

🐛 Fix error when no cache is configured

2019-11-27 16:02:46 +01:00

Html2Text.php

N.441 Character "à" in a case log causing the REST/JSON API to fail if mbstring is not enabled

2016-09-26 18:45:32 +00:00

Html2TextException.php

(HTML) Formatted Case Logs, Description and Notifications with inline images uploaded as Attachments. Beta Version !!

2016-02-19 10:03:59 +00:00

iotask.class.inc.php

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

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

itopwebpage.class.inc.php

N°985 - Add applicable contexts on Trigger

2020-01-20 15:50:08 +01:00

itopwizardwebpage.class.inc.php

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

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

loginbasic.class.inc.php

n°1617 - meets iTop fence requirements

2019-10-09 18:53:40 +02:00

logindefault.class.inc.php

n°1617 - meets iTop fence requirements

2019-10-09 18:53:40 +02:00

loginexternal.class.inc.php

N°2311 - Refactor Login FSM for errors

2019-09-27 13:12:00 +02:00

loginform.class.inc.php

N°2315 - Login screen extensibility API refactor

2019-10-25 14:35:24 +02:00

logintwig.class.inc.php

N°2315 - Login screen extensibility API refactor

2019-10-24 14:56:01 +02:00

loginurl.class.inc.php

n°1617 - meets iTop fence requirements

2019-10-09 18:53:40 +02:00

loginwebpage.class.inc.php

Merge branch 'master' into develop

2020-01-20 16:42:42 +01:00

maintenancemsg.php

Internal: Add automatic refresh of the maintenance page every 30s to redirect user to iTop when done

2019-12-17 11:48:27 +01:00

menunode.class.inc.php

N°2314 Introduce custom themes for iTop's console

2019-12-12 15:46:03 +01:00

newsroomprovider.class.inc.php

Newsroom finalization & integration tests.

2018-12-06 15:38:29 +01:00

nicewebpage.class.inc.php

N°2314 Regression: fix crash on setup ⌨️ 🐒

2019-12-16 14:16:29 +01:00

pdfpage.class.inc.php

N°2529 Fix charset sent by logout page

2019-10-09 18:07:08 +02:00

portaldispatcher.class.inc.php

Improved the User Rights management API:

2015-12-15 20:30:30 +00:00

query.class.inc.php

N°1872 Regression when editing query phrasebook entries. Fixed.

2018-12-13 11:46:39 +01:00

shortcut.class.inc.php

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

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

startup.inc.php

N°2240 - Supportability - Maintenance mode

2019-09-27 17:13:25 +02:00

template.class.inc.php

N°2313 - Markup extensibility: Update usages of admin. console tabs to have codes and titles

2020-01-15 08:42:35 +01:00

themehandler.class.inc.php

N°2314 Introduce custom themes for iTop's console

2019-12-12 15:46:03 +01:00

transaction.class.inc.php

N°2345 privUITransactionFile : avoid create dir race condition

2019-06-26 10:17:47 +02:00

twigextension.class.inc.php

🎨 Login screen extensibility

2019-10-23 17:27:04 +02:00

ui.extkeywidget.class.inc.php

PHPDoc

2020-01-20 09:53:22 +01:00

ui.htmleditorwidget.class.inc.php

N°1164, SF#1491: Add code snippets with syntax highlighting to CaseLog/HTML fields

2019-05-17 15:59:01 +02:00

ui.linksdirectwidget.class.inc.php

N°2044 - Search Form Prefill not effective when searching objects to add to an AttributeLinkedSet (n:1)

2019-06-18 15:53:48 +02:00

ui.linkswidget.class.inc.php

🎨 Fix bad parameter init

2019-12-03 08:38:57 +01:00

ui.passwordwidget.class.inc.php

Updated jQuery to v3.3.1

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

ui.searchformforeignkeys.class.inc.php

advanced search: removal of legacy_search_drawer_open

2018-04-06 12:06:20 +00:00

uiwizard.class.inc.php

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

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

user.dashboard.class.inc.php

Updated copyright (2012) and license (LGPL changed to AGPL)

2012-10-23 21:41:36 +00:00

user.preferences.class.inc.php

Archive mode: fixed the recording of user preferences

2017-06-30 10:00:38 +00:00

utils.inc.php

utils::GetDefaultUrlAppRoot : make comparison case insentitive, add a test

2019-12-23 11:06:29 +01:00

webpage.class.inc.php

N°2313 - Markup extensibility: Add field label in its metadata

2020-01-20 14:43:40 +01:00

wizardhelper.class.inc.php

N°2329 PHP 7.4 compat : remove get_magic_quotes_gpc/get_magic_quotes_runtime calls

2019-12-24 17:30:12 +01:00

xlsxwriter.class.php

N°2329 PHP 7.4 compat : remove deprecated array with curly braces

2019-12-23 18:44:52 +01:00

xmlpage.class.inc.php

N°2529 Fix charset sent by logout page

2019-10-09 18:07:08 +02:00