mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-13 07:24:13 +01:00
# Conflicts: # composer.lock # core/email.class.inc.php # datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php # lib/bin/generate-deps-for-config-factory # lib/bin/generate-deps-for-config-factory.bat # lib/bin/generate-factory-for-class # lib/bin/generate-factory-for-class.bat # lib/composer/autoload_classmap.php # lib/composer/autoload_files.php # lib/composer/autoload_psr4.php # lib/composer/autoload_real.php # lib/composer/autoload_static.php # lib/composer/installed.json # lib/composer/installed.php # lib/laminas/laminas-servicemanager/bin/generate-deps-for-config-factory # lib/laminas/laminas-servicemanager/bin/generate-factory-for-class # lib/laminas/laminas-servicemanager/src/AbstractPluginManager.php # lib/laminas/laminas-servicemanager/src/ServiceManager.php # lib/laminas/laminas-validator/src/Db/AbstractDb.php # lib/laminas/laminas-validator/src/Isbn/Isbn10.php # lib/laminas/laminas-validator/src/Isbn/Isbn13.php # sources/Core/Email/EmailFactory.php # templates/pages/backoffice/oauth/Wizard.html.twig
In order to better separate our developments from the embedded third-party libs, files should be moved in either the /backoffice, /lib or something new folders.
IMPORTANT: Before moving a file, we should first consider if:
- The file is used in an iTop extension that should be compatible with the iTop version currently under developments
- The file is still used in iTop itself (or if we can consider removing it for clean up)