Molkobain
25103b9f0b
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-16 14:35:39 +02:00
Molkobain
c5d5379c49
N°5408 - Mentions: Fix empty results for class with no image attribute
2022-08-16 14:21:28 +02:00
acognet
02d5f8560f
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-12 18:26:00 +02:00
Anne-Catherine
47becb3be8
N°5024 - Missing result in search widget for external key ( #327 )
...
* N°5024 - Missing result in search widget for external key
2022-08-12 18:23:29 +02:00
acognet
7ec12f1e12
N°4517 - PHP 8.1: Replace htmlentities(***, ENT_QUOTES, 'UTF-8') with utils::EscapeHtml
2022-07-01 09:22:25 +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
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
acognet
ec86bd246a
N°5129 - Unwanted popup during a transition with an AttributeExternalField
2022-06-21 15:24:25 +02:00
Molkobain
4eb43cd02d
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-05-18 19:29:57 +02:00
Benjamin Dalsass
5574eabfed
N°4899 Adjust url sanitizer for 3.0 compliance
2022-05-18 10:49:23 +02:00
Molkobain
6a332ca60b
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-05-18 10:43:22 +02:00
Benjamin Dalsass
87f606f768
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# application/dashlet.class.inc.php
# pages/ajax.render.php
# pages/csvimport.php
# test/phpunit.xml.dist
2022-05-18 10:38:50 +02:00
Benjamin Dalsass
8e97279401
N°4899 - Reflected XSS on revert_dashboard operation
2022-05-17 09:27:06 +02:00
Molkobain
a4390fbb57
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# test/application/search/CriterionConversionTest.php
# test/application/search/CriterionParserTest.php
# test/application/search/SearchFormTest.php
2022-04-25 14:03:02 +02:00
Pierre Goiffon
f4a027b474
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# composer.json
# core/cmdbchangeop.class.inc.php
# core/cmdbobject.class.inc.php
# css/light-grey.scss
# setup/setuputils.class.inc.php
# test/ItopTestCase.php
# test/core/ConfigTest.php
# test/core/LogAPITest.php
# test/core/UserRightsTest.php
# test/core/dictApcuTest.php
# test/core/dictTest.php
# test/core/iTopConfigParserTest.php
# test/core/ormLinkSetTest.php
# test/phpunit.xml.dist
# test/postbuild_integration.xml.dist
# test/setup/SetupUtilsTest.php
# test/status/StatusIncTest.php
# webservices/cron.php
2022-04-22 15:26:18 +02:00
Molkobain
b03e28efb9
N°4966 - Code cleanup
2022-04-19 12:13:14 +02:00
acognet
6fa2d47780
N°4538 - Dashlet Groupby on ExternalKey with special character, bad display
2022-04-15 10:03:04 +02:00
acognet
079b406f18
N°4966 - No more custom dashboard switch
2022-04-15 09:54:41 +02:00
Molkobain
ad4442ae78
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-03-23 09:49:11 +01:00
Pierre Goiffon
9d2c89f118
N°4959 Fix graph dashlet not refreshed
...
Previous fix in e4501389
2022-03-18 15:16:52 +01:00
acognet
e45013891c
N°4959 - Chart update fails in dashboard
2022-03-16 11:05:50 +01:00
acognet
1db4b9a12e
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-03-16 09:44:33 +01:00
Molkobain
5f80be75ed
N°4938 - Fix remaining broken AJAX endpoints in ajax.render.php
2022-03-11 10:47:05 +01:00
Molkobain
0d4796ae2b
N°4938 - Fix background calls broken by lazy JS dictionaries loads
2022-03-11 09:34:27 +01:00
Molkobain
5854c199d0
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-03-07 12:54:13 +01:00
Molkobain
faa38155e5
N°4911 - Mentions: Fix DBObject::Reload() for classes with an image attribute
2022-03-06 22:44:13 +01:00
Molkobain
558bbc3357
Revert "N°4911 - Mentions: Fix Person picture not displayed if marker configured on parent class (Contact)"
...
This reverts commit 106127e6b7
2022-03-06 22:44:13 +01:00
Molkobain
cd7f9e478f
N°4913 - Avoid object initials to overflow in medallions
2022-03-06 22:44:12 +01:00
Molkobain
106127e6b7
N°4911 - Mentions: Fix Person picture not displayed if marker configured on parent class (Contact)
2022-03-06 12:49:11 +01:00
Eric Espie
4bdf84bf6c
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-03-03 10:23:38 +01:00
Pierre Goiffon
4b731dd336
N°4836 Better fix by adding AjaxPage::SetOutputDataOnly()
2022-02-22 10:23:15 +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
Pierre Goiffon
33ceab86fb
N°4836 Fix dashlet editor when iBackofficeDictEntriesExtension impl exists
2022-02-21 16:52:31 +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
Molkobain
44c18395b3
N°4072 - Deprecate ajax.render.php xlsx_* operations
2022-01-27 11:42:30 +01:00
Molkobain
d89dc1aa4d
N°3824 - History: Remove deprecated APIs from 2.7 and older
2022-01-21 18:10:12 +01:00
acognet
17e8c53236
demove deprecated functions : replace ajax_page by AjaxPage
2022-01-21 11:52:02 +01:00
Stephen Abello
4511883baf
N°4481 Fix created elements on 1-n disappearing when table is redrawn
2021-12-13 17:01:18 +01:00
Pierre Goiffon
2bb142e8ee
Merge remote-tracking branch 'origin/support/2.7' into develop
...
# Conflicts:
# application/ui.extkeywidget.class.inc.php
# pages/ajax.render.php
2021-12-10 18:18:17 +01:00
Pierre Goiffon
69578d5d07
Merge remote-tracking branch 'origin/support/2.6' into support/2.7
2021-12-10 12:30:57 +01:00
Pierre Goiffon
97d6d413bb
N°4502 Fix dashboard page not refreshed after saving customm dashboard
2021-12-10 12:30:33 +01:00
Pierre Goiffon
7e0d5d64ce
Merge remote-tracking branch 'origin/support/2.6' into support/2.7
2021-12-10 09:21:43 +01:00
Pierre Goiffon
3f8f57fa9a
N°4502 Fix cannot create new or edit existing custom dashboard
...
Regression brought by dbaf9241
2021-12-10 09:15:43 +01:00
Pierre Goiffon
67fa156c0e
Merge remote-tracking branch 'origin/support/2.7' into develop
...
# Conflicts:
# application/dashboard.class.inc.php
# core/action.class.inc.php
# datamodels/2.x/combodo-db-tools/dictionaries/es_cr.dict.combodo-db-tools.php
# datamodels/2.x/itop-attachments/dictionaries/es_cr.dict.itop-attachments.php
# datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
# datamodels/2.x/itop-core-update/dictionaries/es_cr.dict.itop-core-update.php
# datamodels/2.x/itop-hub-connector/dictionaries/es_cr.dict.itop-hub-connector.php
# datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-portal-base/dictionaries/es_cr.dict.itop-portal-base.php
# datamodels/2.x/itop-request-mgmt-itil/dictionaries/es_cr.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt/dictionaries/es_cr.dict.itop-request-mgmt.php
# datamodels/2.x/itop-sla-computation/dictionaries/es_cr.dict.itop-sla-computation.php
# datamodels/2.x/itop-storage-mgmt/dictionaries/es_cr.dict.itop-storage-mgmt.php
# datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php
# datamodels/2.x/itop-virtualization-mgmt/dictionaries/es_cr.dict.itop-virtualization-mgmt.php
# datamodels/2.x/itop-welcome-itil/es_cr.dict.itop-welcome-itil.php
# dictionaries/es_cr.dictionary.itop.core.php
# dictionaries/es_cr.dictionary.itop.ui.php
# pages/ajax.render.php
# setup/wizardsteps.class.inc.php
# synchro/synchro_import.php
2021-11-19 10:28:46 +01:00
Pierre Goiffon
d0fade9ce1
Merge remote-tracking branch 'origin/support/2.6' into support/2.7
...
# Conflicts:
# pages/ajax.render.php
# setup/wizardsteps.class.inc.php
2021-11-17 17:39:36 +01:00
Pierre Goiffon
84426c6634
N°4365 Security hardening
2021-11-17 10:15:12 +01:00
Pierre Goiffon
dbaf924171
N°4363 Security hardening
2021-11-16 17:19:19 +01:00
Pierre Goiffon
bcca6ac720
Merge remote-tracking branch 'origin/support/2.6' into support/2.7
2021-11-15 15:07:19 +01:00
acognet
2de6ba2827
N°3928 - Polishing: Impact analysis
2021-11-09 15:18:08 +01:00
Pierre Goiffon
2beb795f9a
N°4304 Security hardening
2021-11-09 11:32:53 +01:00
