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

..

bin

Merge branch 'support/2.7' into develop

2021-06-14 16:19:56 +02:00

combodo/tcpdf

Fix missing author information in composer.json for TCPDF lib.

2020-09-28 14:29:51 +02:00

composer

Merge branch 'support/2.7' into develop

2021-06-14 16:19:56 +02:00

necolas/normalize.css

N°2847 - WIP: Sync. commit

2020-07-27 15:09:31 +02:00

nikic/php-parser

⬇️ Restore php-parser to its original version as tests are failing :/

2021-03-29 16:51:10 +02:00

paragonie/random_compat

N°2435.1 Portal: Split portal composer.json in 2

2019-08-13 10:34:22 +02:00

pear

Merge branch 'support/2.7' into develop

2021-06-14 16:19:56 +02:00

pelago/emogrifier

N°2435.6 Add .gitignore to remove non necessary folders from dependancies (eg. examples, tests, docs, ...)

2019-08-14 14:06:56 +02:00

psr

N°2651 - Remove test directories from lib

2020-02-20 15:03:36 +01:00

scssphp/scssphp

N°2696 - Upgrade SCSSPHP to v1.0.6 (PHP 7.4 compatibility)

2020-01-14 10:35:53 +01:00

swiftmailer/swiftmailer

N°2696 - Upgrade SwiftMailer to v5.4.12 (Allow explicit tls1.0, tls1.1, tls1.2 for startTLS)

2020-01-14 10:35:53 +01:00

symfony

N°2651 - Remove test directories from lib

2020-02-20 15:03:36 +01:00

twig/twig

N°2651 - Remove test directories from lib

2020-02-20 15:03:36 +01:00

.gitignore

N°2435.7 Manage ArchiveTar lib using composer

2019-08-14 14:06:56 +02:00

.htaccess

N°3231 - Allow browser access to static resources files in the /lib folder

2020-08-04 13:26:57 +02:00

autoload.php

N°2435.1 Portal: Split portal composer.json in 2

2019-08-13 10:34:22 +02:00

web.config

N°3231 - Allow browser access to static resources files in the /lib folder

2020-08-04 13:26:57 +02:00