Pierre Goiffon
23c15c1b6c
Revert "N°2902 - Intersect with union generates unwanted alias renaming"
...
This reverts commit 866e4ab995
2020-04-27 09:36:38 +02:00
Eric
866e4ab995
N°2902 - Intersect with union generates unwanted alias renaming
2020-04-24 18:32:40 +02:00
Pierre Goiffon
f364e7b043
N°2923 Datatable : fix var name typo
...
Thanks @bruno-ds !
2020-04-24 18:28:50 +02:00
Pierre Goiffon
42afe033ef
N°2923 Datatable : use container id instead of externally generated id
2020-04-24 17:16:47 +02:00
Eric
75730eeea0
Log database deadlocks in EventIssue
2020-04-23 15:25:12 +02:00
Pierre Goiffon
58fd8709be
Merge remote-tracking branch 'origin/support/2.6' into support/2.7
...
# Conflicts:
# css/css-variables.scss
# 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-db-tools/module.combodo-db-tools.php
# datamodels/2.x/itop-backup/module.itop-backup.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-datacenter-mgmt/module.itop-datacenter-mgmt.php
# datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.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-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
2020-04-22 11:14:59 +02:00
Eric
f18ea18a5b
N°2936 - TLs option is not set for restore function
2020-04-21 16:59:16 +02:00
Pierre Goiffon
1904bfdba6
css-variables : update to 2.7.0-2
2020-04-21 16:35:41 +02:00
acognet
e1949cd3eb
N°2509 - Change Columns via "Configure this list" show obsolete data though user preferences is "not shown obsolete data"
2020-04-21 12:45:59 +02:00
Eric
1b2d3d1e84
N°2952 - Provisioning for hybrid auth fails
...
Changed Origin for change to an allowed value
2020-04-21 11:59:48 +02:00
Pierre Goiffon
c5b1f02d2b
🔖 Update versions to 2.6.4
2020-04-21 08:52:42 +02:00
Pierre Goiffon
f81ab4d71a
🚀 Release tool to update versions
...
Was already comitted in 2.7 branch (fd1e17cc
2020-04-21 08:50:25 +02:00
acognet
0b95dbee7f
N°1588 - Count on Managed Brick sometimes wrong
2020-04-20 16:31:56 +02:00
Pierre Goiffon
8de4c0360d
Merge remote-tracking branch 'origin/support/2.7' into develop
2020-04-20 16:08:15 +02:00
Pierre Goiffon
db593ff85e
Merge remote-tracking branch 'origin/support/2.6' into support/2.7
...
# Conflicts:
# application/loginwebpage.class.inc.php
# application/menunode.class.inc.php
# datamodels/2.x/itop-portal-base/portal/src/controllers/aggregatepagebrickcontroller.class.inc.php
# datamodels/2.x/itop-portal-base/portal/src/controllers/userprofilebrickcontroller.class.inc.php
# datamodels/2.x/itop-portal-base/portal/src/views/bricks/manage/popup-export-excel.html.twig
# pages/ajax.render.php
2020-04-20 16:05:56 +02:00
Eric Espié
1f750bb12d
N°2902 Fix alias renaming when already exists in one OQL of an UNION
...
The legacy impl is not modified
2020-04-20 14:59:56 +02:00
Pierre Goiffon
4ee66377ce
Merge commit '15e5e21a89a3d3214dace82b8765a47e304a8f29' into support/2.7
2020-04-20 14:21:55 +02:00
Eric
432a950f8c
N°2945 - Fix fatal error when adding empty attachment
...
alert when empty attachment is detected
2020-04-20 10:54:27 +02:00
Molkobain
24130dd94f
Change version number to 2.8.0-dev
2020-04-14 18:01:30 +02:00
acognet
bbc751bee4
N°2383 - GetAttributeFlag ignored on form refresh with dependent field
2020-04-14 17:56:27 +02:00
acognet
a77ba2fbab
N°2564 - Stop copy after "<" character in a Copy operation on a Transition - change only in Copy function
2020-04-14 17:56:27 +02:00
Eric
5b60ec9edf
N°2919 - Dashboard - Fix dashboard not saved
...
the sanitization was too strong. Some names can contain ':'
2020-04-10 18:11:36 +02:00
Eric
b88b9dabdb
N°2919 - Dashboard - Fix dashboard not saved
...
The sanitization was too strong. Some names can contain ':'
2020-04-09 17:59:52 +02:00
Eric
06b17e82db
N°2755 - Security hardening
2020-04-09 11:03:07 +02:00
Eric
2add79a473
N°2853 - Security hardening
2020-04-09 10:55:17 +02:00
Molkobain
3103f361a4
Update 2.7.0-1 release date
2020-04-08 11:02:03 +02:00
Eric
3a37e24496
N°2306 - Security hardening
2020-04-08 09:28:20 +02:00
Pierre Goiffon
59cc6d3f76
📝 CONTRIBUTING : fix unecessary escape
2020-04-07 15:33:26 +02:00
Pierre Goiffon
ee37373cfa
📝 CONTRIBUTING : branch model paragraph small changes
2020-04-07 15:24:56 +02:00
acognet
621295199c
N°1402 - Attribut File cannot be emptied Add a trash next to the name of the file
2020-04-06 16:36:46 +02:00
Eric
b1d703bff3
N°1671 Portal: Fix Aggregate Brick when user profile is not allowed to see one of the sub-brick
2020-04-06 14:07:42 +02:00
Eric
a3a34a94e7
N°1355 - Security hardening
2020-04-06 11:47:57 +02:00
Stephen Abello
6edc365685
N°2742 - HTML files preview are now raw text only
2020-04-06 09:47:24 +02:00
Stephen Abello
4b7f736af0
N°2755 - Security hardening
2020-04-06 09:42:41 +02:00
Stephen Abello
016fbaed36
N°2755 - Security hardening
2020-04-06 09:42:15 +02:00
Stephen Abello
bfcd137e52
N°2853 - Security hardening
...
(cherry picked from commit d01caaf4e4
2020-04-06 09:37:58 +02:00
Pierre Goiffon
56d9653f15
📝 CONTRIBUTING : modify branch model
...
We are renaming the master branch, so using a custom GitFlow branch model :)
2020-04-06 09:32:23 +02:00
Stephen Abello
f9af8fc912
N°2855 - Security hardening
...
(cherry picked from commit c5c7fd5c85
2020-04-06 09:20:02 +02:00
Eric
c1a7a36896
Compatibility with MySQL 5.6
2020-04-06 09:02:06 +02:00
Pierre Goiffon
d5670abdcc
📝 Fix PHPDoc for \MFElement::_FindNode
...
Introduced in 4688c92e
2020-04-06 08:57:23 +02:00
Pierre Goiffon
0360a3160d
Merge remote-tracking branch 'origin/releases/germanium' into develop
...
# Conflicts:
# setup/modelfactory.class.inc.php
2020-04-06 08:47:22 +02:00
Thomas Casteleyn
bcd21aefb4
📝 DBObject fix wrong PHPDoc ( #133 )
...
Thanks to @Hipska !
2020-04-06 08:32:31 +02:00
acognet
d5fe653e51
N°2848 - Align creation and update message on portal to console message - add a comment for next time
2020-04-02 20:31:06 +02:00
acognet
fc2fb235a2
N°1344 - Save without all mandatory attributes (ajax reload not finished)
2020-04-02 17:46:18 +02:00
acognet
d7211509bd
N°1062 - Portal : autocomplete and search = broken : change the max size of the list
2020-04-02 17:29:39 +02:00
acognet
c182b1a01f
N°2848 - Align creation and update message on portal to console message
2020-04-02 11:50:01 +02:00
Eric
15e5e21a89
Compatibility with MySQL 5.6
2020-04-01 17:37:55 +02:00
acognet
ee0d231426
N°2895 - Tab dictionnary entries not taken in account in "Printer Friendly Version" screen
2020-04-01 01:05:13 +02:00
acognet
3282b46c9b
N°2395 - Error in file light-gray.scss
2020-04-01 00:01:26 +02:00
acognet
05649ba50f
Merge branch 'master' of github.com:Combodo/iTop
2020-03-31 23:48:35 +02:00
