acognet
|
29f23fa992
|
N°2743 - Upgrade libraries php-parser
php composer.phar update nikic/php-parser
|
2022-07-01 10:45:55 +02:00 |
|
Romain Quetiez
|
0ff25728a4
|
Update CONTRIBUTING.md
Clarify the copyright ownership
|
2022-06-30 09:58:17 +02:00 |
|
Pierre Goiffon
|
56fdf8dd63
|
Merge remote-tracking branch 'origin/support/3.0.0-beta4' into develop
# Conflicts:
# datamodels/2.x/authent-local/dictionaries/de.dict.authent-local.php
# datamodels/2.x/authent-local/dictionaries/es_cr.dict.authent-local.php
# datamodels/2.x/authent-local/dictionaries/zh_cn.dict.authent-local.php
# datamodels/2.x/itop-backup/dictionaries/de.dict.itop-backup.php
# datamodels/2.x/itop-backup/dictionaries/fr.dict.itop-backup.php
# datamodels/2.x/itop-backup/dictionaries/zh_cn.dict.itop-backup.php
# datamodels/2.x/version.xml
# dictionaries/cs.dictionary.itop.ui.php
# dictionaries/de.dictionary.itop.ui.php
# dictionaries/tr.dictionary.itop.ui.php
# dictionaries/ui/components/datatable/de.dictionary.itop.datatable.php
# dictionaries/ui/components/datatable/es_cr.dictionary.itop.datatable.php
# dictionaries/ui/components/datatable/ru.dictionary.itop.datatable.php
# dictionaries/ui/components/datatable/zh_cn.dictionary.itop.datatable.php
# dictionaries/zh_cn.dictionary.itop.ui.php
|
2022-06-29 10:00:38 +02:00 |
|
Pierre Goiffon
|
130b4b176f
|
Merge remote-tracking branch 'origin/support/3.0' into develop
# Conflicts:
# composer.lock
# lib/composer/autoload_classmap.php
# lib/composer/autoload_files.php
# lib/composer/autoload_static.php
# lib/composer/installed.json
# lib/composer/installed.php
|
2022-06-28 16:00:54 +02:00 |
|
Pierre Goiffon
|
779ac0e4d9
|
Dump autoloader
|
2022-06-28 15:19:08 +02:00 |
|
Pierre Goiffon
|
4a20a6e525
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts:
# composer.lock
# lib/composer/autoload_files.php
# lib/composer/autoload_real.php
# lib/composer/autoload_static.php
# lib/composer/installed.json
# lib/composer/installed.php
|
2022-06-28 15:16:41 +02:00 |
|
Pierre Goiffon
|
2392f4a902
|
🔒 Update guzzlehttp/guzzle
|
2022-06-28 15:13:04 +02:00 |
|
Benjamin Dalsass
|
cb1203fde9
|
Merge 2.7 into Support 3.0 : Update oauth composer
|
2022-06-28 15:09:19 +02:00 |
|
Purple Grape
|
0c14423213
|
improved Chinese translation (#302)
1. words refine
2. remove unwanted blank
3. punctuation related issue
Co-Authored-By: Devin <bdejin@hotmail.com>
|
2022-06-28 12:34:21 +02:00 |
|
Pierre Goiffon
|
1135896b3d
|
Composer dump autoloader
|
2022-06-28 12:05:47 +02:00 |
|
acognet
|
39cd933ebb
|
N°5108 - Update embedded libs for PHP 8.0 (3.0 branch)
|
2022-06-28 12:03:01 +02:00 |
|
Pierre Goiffon
|
2fcc386e1e
|
Fix compilation error on OAuthClient.status
XML file version was update but structure wasn't aligned with the new XML version (AttributeEnum structure)
|
2022-06-28 11:55:03 +02:00 |
|
acognet
|
bf01be6f19
|
N°4988 - History API : change consumers (iTop core)
|
2022-06-28 11:30:16 +02:00 |
|
acognet
|
b47d3cda12
|
N°5232 - Deprecate \CMDBObject::DBCloneTracked - fix phpdoc
|
2022-06-28 11:29:15 +02:00 |
|
acognet
|
01c76f19ed
|
N°4988 - History API : change consumers (iTop core)
|
2022-06-28 11:26:19 +02:00 |
|
acognet
|
682f20bbba
|
N°5108 - Update embedded libs for PHP 8.0 (3.0 branch)
|
2022-06-28 11:24:47 +02:00 |
|
Pierre Goiffon
|
eb8ea0fbd4
|
Remove Symfony tests dir
|
2022-06-28 11:14:52 +02:00 |
|
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 |
|
Pierre Goiffon
|
74f7775332
|
Restore images/icons/*
Were removed by the merge in f0b94dd0
|
2022-06-28 11:02:56 +02:00 |
|
Eric Espie
|
a0f28a9098
|
N°5102 - Allow to send emails using GSuite SMTP and OAuth - Rework
|
2022-06-28 10:47:20 +02:00 |
|
acognet
|
93a69cbc49
|
N°5108 - Update embedded libs for PHP 8.0 (3.0 branch)
|
2022-06-27 23:38:58 +02:00 |
|
Benjamin Dalsass
|
de040a0922
|
Merge 3.0 into Dev : Upgrade oauth module version to 3.1.0
|
2022-06-27 09:54:50 +02:00 |
|
Benjamin Dalsass
|
4af54f26b6
|
Merge remote-tracking branch 'origin/support/3.0' into develop
|
2022-06-27 09:52:15 +02:00 |
|
Benjamin Dalsass
|
15b9ea45a0
|
Merge 2.7 into Support 3.0 : Upgrade oauth module version to 3.0.1
|
2022-06-27 09:31:49 +02:00 |
|
Benjamin Dalsass
|
02dab4eb72
|
Merge remote-tracking branch 'origin/support/3.0' into develop
# Conflicts:
# lib/composer/autoload_files.php
# lib/composer/autoload_static.php
# templates/pages/backoffice/oauth/Wizard.html.twig
|
2022-06-27 08:38:01 +02:00 |
|
Benjamin Dalsass
|
1b76e96720
|
Merge 2.7 into Support 3.0 : Update autoload
|
2022-06-27 08:18:49 +02:00 |
|
Benjamin Dalsass
|
f0b94dd0f7
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts:
# core/config.class.inc.php
# datamodels/2.x/installation.xml
# datamodels/2.x/itop-oauth-client/assets/img/icons8-adjust.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-administrative-tools.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-application-window.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-apps-tab.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-archive-folder.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-audit.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-automatic.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-bandage.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-book-error.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-calendar.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-cassette.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-change-approved.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-change-emergency.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-change-normal.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-change-routine.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-change.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-checkmark.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-cloud-file.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-conflict.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-contract.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-customer.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-database-custom.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-database.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-delete.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-department.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-desktop.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-discussion-forum.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-documents.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-electrical.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-electricity.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-electronics.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-enclosure-for-servers.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-export-csv.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-faq.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-farm.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-file.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-globe-cable.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-globe-fiber.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-globe-wire.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-hdd.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-hierarchy.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-hypervisor.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-import-csv.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-important-book.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-in-transit.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-laptop.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-licence.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-map-as-drive.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-map-marker.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-mobile.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-music-robot.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-nas.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-network.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-new-item.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-note.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-office-phone.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-old-vmware-logo.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-organization.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-person-female.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-phone.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-plug-socket.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-power-plant.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-print.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-process-improvement.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-puzzle.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-rack.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-server-custom.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-server-storage.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-server.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-service.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-services.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-smartphone-tablet.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-software-instance.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-software-license.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-software-other.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-software.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-solve.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-stack.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-switch-san.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-switch.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-tape-library.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-tasklist.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-team.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-telephone.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-time-limit.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-virtual-machine.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-web.svg
# datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml
# dictionaries/cs.dictionary.itop.ui.php
# dictionaries/da.dictionary.itop.ui.php
# dictionaries/de.dictionary.itop.ui.php
# dictionaries/en.dictionary.itop.ui.php
# dictionaries/es_cr.dictionary.itop.ui.php
# dictionaries/fr.dictionary.itop.ui.php
# dictionaries/hu.dictionary.itop.ui.php
# dictionaries/it.dictionary.itop.ui.php
# dictionaries/ja.dictionary.itop.ui.php
# dictionaries/nl.dictionary.itop.ui.php
# dictionaries/pt_br.dictionary.itop.ui.php
# dictionaries/ru.dictionary.itop.ui.php
# dictionaries/sk.dictionary.itop.ui.php
# dictionaries/tr.dictionary.itop.ui.php
# dictionaries/zh_cn.dictionary.itop.ui.php
# js/wizardhelper.js
# lib/composer/autoload_classmap.php
# lib/composer/autoload_real.php
# lib/composer/autoload_static.php
# templates/pages/backoffice/oauth/Wizard.html.twig
|
2022-06-27 08:11:28 +02:00 |
|
Eric Espie
|
6df622e8ed
|
N°5102 - Allow to send emails using GSuite SMTP and OAuth - Rework
|
2022-06-23 14:05:17 +02:00 |
|
Eric Espie
|
54eb9d081b
|
N°5102 - Allow to send emails using GSuite SMTP and OAuth - Rework
|
2022-06-23 12:20:53 +02:00 |
|
Eric Espie
|
9f60f27636
|
N°5102 - Allow to send emails using GSuite SMTP and OAuth - Rework
|
2022-06-22 16:41:45 +02:00 |
|
acognet
|
306e16147a
|
N°5232 - Deprecate \CMDBObject::DBCloneTracked
|
2022-06-22 09:19:58 +02:00 |
|
acognet
|
aae1e12b2e
|
N°4988 - History API : change consumers (iTop core)
|
2022-06-21 18:12:35 +02:00 |
|
Eric Espie
|
ba59643f52
|
N°5102 - Allow to send emails using GSuite SMTP and OAuth - Rework
|
2022-06-21 16:47:46 +02:00 |
|
Eric Espie
|
01c02a75a8
|
N°5102 - Allow to send emails using GSuite SMTP and OAuth - Rework
|
2022-06-21 16:40:43 +02:00 |
|
Eric Espie
|
f5b3e5f341
|
N°5102 - Allow to send emails using GSuite SMTP and OAuth - Rework
|
2022-06-21 16:10:34 +02:00 |
|
Eric Espie
|
9b825cb529
|
N°5102 - Allow to send emails using GSuite SMTP and OAuth - Rework
|
2022-06-21 16:05:58 +02:00 |
|
Eric Espie
|
3f326f0913
|
N°5102 - Allow to send emails using GSuite SMTP and OAuth - Rework
|
2022-06-21 16:05:58 +02:00 |
|
acognet
|
ec86bd246a
|
N°5129 - Unwanted popup during a transition with an AttributeExternalField
|
2022-06-21 15:24:25 +02:00 |
|
Eric Espie
|
aa90d5b6ab
|
N°5102 - Allow to send emails using GSuite SMTP and OAuth - Rework
|
2022-06-21 13:51:08 +02:00 |
|
Pierre Goiffon
|
d6798470e7
|
💡 N°5248 \cmdbAbstractObject::DisplayBareHeader phpdoc v3
|
2022-06-21 12:15:04 +02:00 |
|
Pierre Goiffon
|
073388436b
|
💡 N°5248 \cmdbAbstractObject::DisplayBareHeader phpdoc v2
|
2022-06-21 10:21:10 +02:00 |
|
Pierre Goiffon
|
84d1be07cd
|
💡 N°5248 Document method signature change in \cmdbAbstractObject::DisplayBareHeader
|
2022-06-20 15:38:51 +02:00 |
|
Benjamin Dalsass
|
bd3724be8f
|
symfony 5.4 (twig filter initialization correction)
|
2022-06-20 08:22:23 +02:00 |
|
Pierre Goiffon
|
26747b8c7e
|
Merge remote-tracking branch 'origin/support/3.0.1' into support/3.0
|
2022-06-17 10:50:18 +02:00 |
|
Benjamin Dalsass
|
683ab25e83
|
Merge remote-tracking branch 'origin/support/3.0' into develop
# Conflicts:
# lib/composer/autoload_files.php
# lib/composer/autoload_static.php
|
2022-06-17 10:14:01 +02:00 |
|
Benjamin Dalsass
|
d0b8c560f6
|
N°5037 - Setup: Add disclaimer about collected data
3.0 look and feel adaptation
|
2022-06-17 09:50:36 +02:00 |
|
Benjamin Dalsass
|
4d180eb303
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts:
# composer.lock
# js/wizardhelper.js
# lib/composer/autoload_real.php
# lib/composer/installed.json
# lib/composer/installed.php
# lib/guzzlehttp/guzzle/CHANGELOG.md
# setup/wizardsteps.class.inc.php
|
2022-06-17 09:25:57 +02:00 |
|
acognet
|
53d2129bd1
|
N°5129 - Unwanted popup during a transition with an AttributeExternalField
|
2022-06-16 17:58:19 +02:00 |
|
Benjamin Dalsass
|
977a8add67
|
Adjust php setup requirement to version 7.2.5.
Improve test error message.
|
2022-06-16 10:04:13 +02:00 |
|
bdalsass
|
79da71ecf8
|
migration symfony 5 4 (#300)
* symfony 5.4 (diff dev)
* symfony 5.4 (working)
* symfony 5.4 (update autoload)
* symfony 5.4 (remove swiftmailer mailer implementation)
* symfony 5.4 (php doc and split Global accessor class)
### Impacted packages:
composer require php:">=7.2.5 <8.0.0" symfony/console:5.4.* symfony/dotenv:5.4.* symfony/framework-bundle:5.4.* symfony/twig-bundle:5.4.* symfony/yaml:5.4.* --update-with-dependencies
composer require symfony/stopwatch:5.4.* symfony/web-profiler-bundle:5.4.* --dev --update-with-dependencies
|
2022-06-16 09:13:24 +02:00 |
|