Pierre Goiffon
784e553d23
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# composer.json
# composer.lock
# lib/composer/autoload_classmap.php
# lib/composer/autoload_files.php
# lib/composer/autoload_real.php
# lib/composer/autoload_static.php
# lib/composer/installed.php
2022-06-28 11:10:01 +02:00
acognet
93a69cbc49
N°5108 - Update embedded libs for PHP 8.0 (3.0 branch)
2022-06-27 23:38:58 +02:00
Pierre Goiffon
44a8bfd764
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# 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
2022-06-14 09:41:45 +02:00
Pierre Goiffon
fb64fbab0b
Fix syntax error in Darkmoon theme
2022-06-08 18:10:03 +02:00
bdalsass
2b885beb82
Feature/merge 3 0 develop ( #298 )
...
* merging 3.0 into develop
* N°5102 - Allow to send emails (eg. notifications) using GSuite SMTP and OAuth
* migration to iTop 3.1
Co-authored-by: Eric Espie <eric.espie@combodo.com >
2022-06-08 16:27:20 +02:00
Benjamin Dalsass
0819b9baba
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# composer.json
# composer.lock
# core/config.class.inc.php
# core/dbobject.class.php
# core/email.class.inc.php
# datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/it.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/ja.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/nl.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/ru.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/sk.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/tr.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/pt_br.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/view/ConfirmUpdate.html.twig
# datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
# datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
# datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml
# dictionaries/cs.dictionary.itop.core.php
# dictionaries/cs.dictionary.itop.ui.php
# dictionaries/da.dictionary.itop.core.php
# dictionaries/da.dictionary.itop.ui.php
# dictionaries/de.dictionary.itop.core.php
# dictionaries/de.dictionary.itop.ui.php
# dictionaries/en.dictionary.itop.ui.php
# dictionaries/es_cr.dictionary.itop.core.php
# dictionaries/es_cr.dictionary.itop.ui.php
# dictionaries/fr.dictionary.itop.core.php
# dictionaries/fr.dictionary.itop.ui.php
# dictionaries/hu.dictionary.itop.core.php
# dictionaries/hu.dictionary.itop.ui.php
# dictionaries/it.dictionary.itop.core.php
# dictionaries/it.dictionary.itop.ui.php
# dictionaries/ja.dictionary.itop.core.php
# dictionaries/ja.dictionary.itop.ui.php
# dictionaries/nl.dictionary.itop.core.php
# dictionaries/nl.dictionary.itop.ui.php
# dictionaries/pt_br.dictionary.itop.core.php
# dictionaries/pt_br.dictionary.itop.ui.php
# dictionaries/ru.dictionary.itop.core.php
# dictionaries/ru.dictionary.itop.ui.php
# dictionaries/sk.dictionary.itop.core.php
# dictionaries/sk.dictionary.itop.ui.php
# dictionaries/tr.dictionary.itop.core.php
# dictionaries/tr.dictionary.itop.ui.php
# dictionaries/zh_cn.dictionary.itop.core.php
# dictionaries/zh_cn.dictionary.itop.ui.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_real.php
# lib/composer/autoload_static.php
# lib/composer/installed.json
# lib/composer/installed.php
# sources/application/TwigBase/Controller/Controller.php
# sources/application/TwigBase/Twig/TwigHelper.php
2022-06-02 16:30:48 +02:00
Molkobain
3514e21772
Revert precompiled themes update
2022-04-04 10:54:11 +02:00
Molkobain
3463b1715a
N°4674 - CKEditor: Fix space indentation in code blocks
2022-04-04 10:21:52 +02:00
acognet
1db4b9a12e
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-03-16 09:44:33 +01:00
Christian Beer
6cf781da33
🌐 Improve German translation ( #277 )
...
Many thanks @ChristianBeer for this great contribution, and @larhip for the validation !
2022-03-10 14:16:59 +01:00
Molkobain
f4ecdf116a
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-03-09 19:55:35 +01:00
Molkobain
1f65ab5a92
N°4642 - Improve conventions
...
* Rename SCSS variables
* Optimize SCSS rules
2022-03-07 17:05:29 +01:00
Molkobain
7cfac7300b
N°4642 - Fix typo in SCSS variables
2022-03-07 16:31:43 +01:00
Eric Espie
4bdf84bf6c
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-03-03 10:23:38 +01:00
Stephen Abello
5e0c7c211b
N°4460 Fix run-query highlight color on error for Full Moon and Darkmoon
2022-02-22 10:13:36 +01:00
Pierre Goiffon
9ce88699ca
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_mosaic.html.twig
# datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_tree.html.twig
2022-02-22 09:40:37 +01:00
Stephen Abello
d783954d13
N°4671 Fix dark moon extra tabs color
2022-02-17 14:48:35 +01:00
Molkobain
3da49e6603
N°4814 - Improve image attribute placeholder when no default image
2022-02-16 11:45:18 +01:00
Pierre Goiffon
d437e2d662
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# application/displayblock.class.inc.php
# core/config.class.inc.php
# datamodels/2.x/authent-cas/module.authent-cas.php
# 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/combodo-backoffice-darkmoon-theme/module.combodo-backoffice-darkmoon-theme.php
# datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php
# datamodels/2.x/itop-attachments/module.itop-attachments.php
# datamodels/2.x/itop-backup/module.itop-backup.php
# datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.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-core-update/module.itop-core-update.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-faq-light/module.itop-faq-light.php
# datamodels/2.x/itop-files-information/module.itop-files-information.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-structure/module.itop-structure.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
2022-02-08 15:43:20 +01:00
Pierre Goiffon
923c3a27a3
Prepare 3.0.1 version
2022-02-08 14:28:27 +01:00
Molkobain
7bb7445c91
N°4482 - Small refacto
...
- SCSS partial rule should target only the concerned elements
- Improve PHPDoc
2022-02-02 16:47:15 +01:00
Molkobain
60c372f535
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-02-02 11:20:58 +01:00
Stephen Abello
7df27de5c1
N°4674 Fix code highlighter calls
2022-02-02 10:35:50 +01:00
Stephen Abello
9c75a705f3
N°4570 Harmonize inputs font size/weight
2022-01-27 16:31:33 +01:00
Molkobain
3bec96abe1
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# core/config.class.inc.php
# setup/itopdesignformat.class.inc.php
2022-01-27 16:09:22 +01:00
Eric Espie
a839b1c4ae
N°4569 - Fix unit tests
2022-01-26 15:14:42 +01:00
Stephen Abello
04a690caff
N°4696 Improve spacing between a fieldset and a field
2022-01-25 15:26:13 +01:00
Molkobain
812606db78
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# core/config.class.inc.php
2022-01-12 15:54:18 +01:00
Molkobain
656bbfe46d
Update precompiled themes
2022-01-12 15:13:39 +01:00
acognet
c1e2ba8abc
Change version number to 3.1.0
2021-12-23 17:05:54 +01:00
acognet
d301562ffe
Change version number to 3.1.0
2021-12-23 09:41:16 +01:00
Molkobain
682c821d0e
Fix combodo-backoffice-darkmoon-theme version to 3.0.0
2021-12-20 16:12:14 +01:00
Stephen Abello
dc81630b16
Add Darkmoon to default datamodel
2021-12-20 14:00:21 +01:00
