Eric
2c2155a8e0
N°3985 - Performance checks on the back end
2021-08-23 13:57:03 +02:00
Pierre Goiffon
d8e2a1cc7c
Merge branch 'support/2.7' into develop
...
# Conflicts:
# README.md
# composer.json
# composer.lock
# core/cmdbsource.class.inc.php
# core/dbobject.class.php
# datamodels/2.x/combodo-db-tools/db_analyzer.class.inc.php
# datamodels/2.x/combodo-db-tools/dbtools.php
# datamodels/2.x/combodo-db-tools/dictionaries/zh_cn.dict.combodo-db-tools.php
# datamodels/2.x/itop-attachments/dictionaries/zh_cn.dict.itop-attachments.php
# datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php
# dictionaries/zh_cn.dictionary.itop.core.php
# dictionaries/zh_cn.dictionary.itop.ui.php
# lib/composer/InstalledVersions.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_static.php
# lib/composer/installed.php
# lib/composer/platform_check.php
# pages/ajax.render.php
# pages/csvimport.php
# setup/ajax.dataloader.php
# setup/index.php
# setup/setuputils.class.inc.php
# test/application/UtilsTest.php
2021-06-14 16:19:56 +02:00
odain
9abd8eb223
fix merge 2.7.4
2021-03-15 16:06:50 +01:00
Molkobain
c3140c2db3
Copyright year bump
2021-03-12 18:48:46 +01:00
Pierre Goiffon
70efa37109
N°3253 Fix setup crashing on incompatible PHP versions ( #178 )
...
We now have a new setup landing page. The old one is renamed setup/wizard.php
This contains revert for "🐛 Fix setup homepage error with PHP < 7.1.0" (91c6916d86
2020-12-04 18:28:39 +01:00
