Pierre Goiffon
c5e00194b7
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# pages/ajax.render.php
2022-11-29 18:22:35 +01:00
Pierre Goiffon
5efd45eafc
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# pages/ajax.render.php
2022-11-29 18:18:24 +01:00
Pierre Goiffon
d412a52fcc
N°4449 Fix FPD in dashboard export/import
2022-11-29 18:10:17 +01:00
bdalsass
bdb29fd99a
Issue/5074 - Routage, Block UI relations, Links row actions ( #369 )
...
* datatable row actions
Below is a sample of extra param to enable feature:
$aExtraParams['row_actions'] = [
[
'tooltip' => 'remove an element',
'icon_css_class' => 'fa-minus',
'js_row_action' => 'console.log("You clicked the remove button");',
'confirmation' => [
'message' => 'UI:ConfirmationMessage',
'message_row_data' => "name",
'remember_choice_pref_key' => 'remove_do_not_show_again',
],
],
[
'tooltip' => 'open in new tab',
'icon_css_class' => 'fa-external-link-square-alt',
'on_action_js' => 'window.open("http://localhost/itop-branchs/dev/pages/UI.php?operation=details&class=UserRequest&id= " + aData.id + "&c[menu]=UserRequest%3AOpenRequests");',
],
[
'tooltip' => 'other actions',
'icon_css_class' => 'fa-ellipsis-v',
'on_action_js' => 'console.log(event);',
],
];
* Contrôleur pour la suppression et le détachement de liens
* Block UI pour l'édition des relations
* Block UI pour la visualisation des relations
* Boutons d'actions pour la suppression et le détachement de liens
* Gestion dialogue de confirmation pour les row actions
2022-11-23 16:10:34 +01:00
Molkobain
a0a5037554
Merge remote-tracking branch 'origin/feature/5655-edit-object-in-modal' into develop
...
# Conflicts:
# pages/ajax.render.php
2022-11-23 15:59:23 +01:00
Eric Espie
0bba9b0fad
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-11-16 13:57:07 +01:00
Eric Espie
e4884470ad
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2022-11-16 09:38:31 +01:00
Eric Espie
68d44fa981
N°5724 - code hardening
2022-11-16 09:32:47 +01:00
Molkobain
a553616ea2
N°5655 - Introduce auto-routing mechanism for backoffice pages (Part 1)
2022-11-15 08:42:27 +01:00
Molkobain
4486842169
N°5655 - Align "activity panel" and "preferences" ajax operation code to new convention
2022-11-15 08:42:26 +01:00
Molkobain
f5b216fd9a
N°5655 - Refactor object modification logic to a dedicated controller for both page / modal modes
2022-11-15 08:42:26 +01:00
Molkobain
dcdce52608
N°5655 - Add new sanitization filters for routing
...
* utils::ENUM_SANITIZATION_FILTER_OPERATION filter to enable operation "namespaces" in current operations for better reading
* utils::ENUM_SANITIZATION_FILTER_ROUTE filter for upcoming auto routing
2022-11-15 08:42:26 +01:00
Molkobain
73139e82cb
N°5655 - Switch backoffice controllers' methods to non-static and now extend an abstract controller
2022-11-15 08:42:25 +01:00
odain
b01627f39d
Merge branch 'saas/3.0' into develop
2022-09-20 16:04:55 +02:00
odain-cbd
766c9f0e7e
N°5305 - CSV import ergonomy PR ( #332 )
...
Reworked UI feedbacks on following attributes:
- enum
- date
- external key
2022-09-20 16:00:33 +02:00
Eric Espie
71464f6d0e
Merge branch 'develop' into feature/faf_event_service
...
# Conflicts:
# core/cmdbobject.class.inc.php
# core/dbobject.class.php
# core/designdocument.class.inc.php
# lib/composer/autoload_files.php
# lib/composer/autoload_static.php
2022-09-19 09:45:08 +02:00
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
c94e24c0ff
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# application/cmdbabstract.class.inc.php
2022-08-12 18:17:00 +02:00
acognet
7320005c08
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# application/cmdbabstract.class.inc.php
# core/coreexception.class.inc.php
# core/dbobject.class.php
2022-08-12 18:13:42 +02:00
Anne-Catherine
d7e5705520
N°5318 - Fix DBObject::CheckValue() messages being HTML encoded when not necessary ( #326 )
...
* Rollback N°4898 - Security fix
* N°5318 - security fix
2022-08-12 17:50:14 +02:00
Stephen Abello
1f3e91efae
Merge branch 'support/3.0' into develop
2022-08-10 14:09:50 +02:00
Stephen Abello
b43b2e9741
Remove padding between Dashlet/Preferences datatables and their parent panel
2022-08-10 14:07:38 +02:00
Eric Espie
8d8cefe948
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-09 17:11:34 +02:00
Stephen Abello
f9487e55d5
N°5088 Fix audit displaying only 10 rules per category
2022-08-09 15:34:46 +02:00
Eric Espie
952bceb3c3
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# composer.json
# core/config.class.inc.php
# core/legacy/dbobjectsearchlegacy.class.php
# core/legacy/querybuildercontextlegacy.class.inc.php
# core/legacy/querybuilderexpressionslegacy.class.inc.php
# lib/composer/autoload_files.php
# lib/composer/autoload_static.php
2022-08-09 10:49:40 +02:00
Eric Espie
029e6114ad
N°4715 - Remove deprecated legacy SQL build
2022-08-09 10:41:46 +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
Eric Espie
682ab44dea
Merge branch 'develop' into feature/faf_event_service
2022-06-30 14:22:52 +02:00
acognet
bf01be6f19
N°4988 - History API : change consumers (iTop core)
2022-06-28 11:30:16 +02:00
acognet
01c76f19ed
N°4988 - History API : change consumers (iTop core)
2022-06-28 11:26:19 +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
aae1e12b2e
N°4988 - History API : change consumers (iTop core)
2022-06-21 18:12:35 +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
Eric Espie
6aef59e42d
Merge branch 'develop' into feature/faf_event_service
...
# Conflicts:
# core/dbobject.class.php
# datamodels/2.x/itop-config/config.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_static.php
# lib/composer/installed.php
2022-06-08 16:51:44 +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
f014ebfeb1
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# core/log.class.inc.php
# setup/modelfactory.class.inc.php
2022-06-08 13:04:50 +02:00
Benjamin Dalsass
34bed5ec4f
N°5215 - Portal insufficient access control for ajax search form
2022-06-07 11:14:43 +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
Eric Espie
23c95ebbf3
Block if event is not registered
2022-06-02 13:48:59 +02:00
Eric Espie
e77f21a0b5
refactor Event Listeners
2022-06-01 14:29:43 +02:00
Eric Espie
812c1f6bb4
Migrate datamodel
2022-06-01 11:19:46 +02:00
Eric Espie
f6855b0d2b
Display events in the datamodel page
2022-06-01 08:44:12 +02:00
acognet
1fd792fed9
N°3950 - Deprecate old unreferenced methods that are @deprecated - remove application/itopwebpage.class.inc.php
2022-05-25 11:35:54 +02:00
Pierre Goiffon
3d541b2a2d
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
2022-05-24 11:29:12 +02:00
Pierre Goiffon
f0d1c3ac60
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# application/utils.inc.php
# core/htmlsanitizer.class.inc.php
# datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
# pages/UI.php
# test/OQL/DataLocalizerTest.php
# test/OQL/OQLToSQLAllClassesTest.php
# test/OQL/OQLToSQLGroupByTest.php
# test/OQL/OQLToSQLNestedSelectTest.php
# test/OQL/OQLToSQLTest.php
# test/application/UtilsTest.php
2022-05-24 11:13:28 +02:00
