composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-19 00:28:47 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,128 Commits 136 Branches 134 Tags
5da76096cf2b65162006db0ab628928cd03e4fa5
Commit Graph

12128 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Dalsass
5da76096cf 🐛 Add missing data attributes in select template 2023-03-06 15:44:09 +01:00
bdalsass
baafb97bdd N°5993 - Add purge mechanism to log system (#447) 
* N°5993 - Add purge mechanism to log system

* Update core/config.class.inc.php

Co-authored-by: Molkobain <lajarige.guillaume@free.fr>

* Update core/log.class.inc.php

Co-authored-by: Molkobain <lajarige.guillaume@free.fr>

* Update core/log.class.inc.php

Co-authored-by: Molkobain <lajarige.guillaume@free.fr>

* Update core/log.class.inc.php

Co-authored-by: Molkobain <lajarige.guillaume@free.fr>

* Update core/log.class.inc.php

Co-authored-by: Molkobain <lajarige.guillaume@free.fr>

* Namespace the log purge config parameters

---------

Co-authored-by: Molkobain <lajarige.guillaume@free.fr>
 2023-03-06 15:25:26 +01:00
Pierre Goiffon
08a0c7ec88 Merge remote-tracking branch 'origin/support/3.0' into develop 2023-03-06 14:57:11 +01:00
Pierre Goiffon
03fb78c38c N°6068 Setup : fix no formatting on error messages 2023-03-06 14:23:21 +01:00
Stephen Abello
c9e656f7a0 N°4460 - Fix configuration editor selected line contrast in Darkmoon 2023-03-06 11:40:32 +01:00
Pierre Goiffon
2ccd1a667d Merge remote-tracking branch 'origin/support/3.0' into develop 2023-03-06 11:32:48 +01:00
Pierre Goiffon
976566ec71 Merge remote-tracking branch 'origin/support/2.7' into support/3.0 
# Conflicts:
#	setup/setuppage.class.inc.php
 2023-03-06 11:26:33 +01:00
Pierre Goiffon
d908827787 N°6016 Setup Wizard : fix MissingDependencyException message logged as html in setup.log 
Was the case since e831d66b (commit for parent bug N°5090)
Now we are getting the text version in the log (and still the html one on screen)

The unattended install isn't concerned : it just prints back CheckResult returned by \SetupUtils::CheckSelectedModules, with the exception text message ($e->getMessage())
 2023-03-06 11:24:46 +01:00
Benjamin Dalsass
7ae86a8bf3 Merge remote-tracking branch 'origin/support/3.0' into develop 
# Conflicts:
#	css/backoffice/pages/_csv-import.scss
#	pages/ajax.render.php
 2023-03-03 14:26:21 +01:00
Denis
93c0b98eb7 N°5922 - Fix plus button semantic on ext. key widget (#448) 
* N°5922 - Enhance plus button on extkeywidget

* Properly reset the target class when closing the dialog

* Make icon buttons as actual clickable links for BeHat

* Apply suggestions from code review

Review by Guillaume. Thanks!

Co-authored-by: Molkobain <lajarige.guillaume@free.fr>
 2023-03-03 14:20:38 +01:00
Stephen Abello
98ab5aa1a4 N°4460 - Fix menu drawer color in Darkmoon 2023-03-03 10:59:49 +01:00
Stephen Abello
f117a2912b N°4460 - Fix minor contrast issue in Darkmoon 2023-03-03 10:50:02 +01:00
Stephen Abello
6594072617 N°4460 - Fix import contrast in Darkmoon 2023-03-03 10:43:39 +01:00
Stephen Abello
6bed56b34e Fix csv import SCSS file 2023-03-03 10:43:17 +01:00
Stephen Abello
94e8151519 N°4460 - Fix popover menu icons and separators style in Darkmoon 2023-03-03 10:24:52 +01:00
Stephen Abello
75b350f638 N°4460 - Fix ace editor style in Darkmoon 2023-03-03 10:06:47 +01:00
Stephen Abello
14cd60dd17 Fix hardcoded white color in markup 2023-03-02 16:36:07 +01:00
Stephen Abello
08f1e5a041 N°4460 - Fix configure this list contrast in Darkmoon 2023-03-02 16:36:07 +01:00
Stephen Abello
4c117d1a33 Fix hardcoded orange in backoffice style 2023-03-02 16:36:07 +01:00
Stephen Abello
f91dfbcf23 N°4460 - Fix datamodel viewer autocomplete contrast in Darkmoon 2023-03-02 16:36:07 +01:00
Stephen Abello
58497b380b Allow to overload datamodel viewer autocomplete style 2023-03-02 16:36:07 +01:00
Stephen Abello
03bff9f2c2 N°4460 - Fix export header contrast in Darkmoon 2023-03-02 16:36:07 +01:00
Stephen Abello
a34d3f91be Fix tabular fields selector SCSS variables 2023-03-02 16:36:06 +01:00
Stephen Abello
05753f174a N°4460 - Fix "load more entries" activity panel buttons contrast in Darkmoon 2023-03-02 16:36:06 +01:00
Stephen Abello
d0c89343b4 N°4460 - Fix skeletons placeholders contrast issue in Darkmoon 2023-03-02 16:36:06 +01:00
Stephen Abello
3021234895 N°4460 - Allow to customize skeleton placeholders colors using CSS3 variables 2023-03-02 16:36:06 +01:00
Stephen Abello
bccdb1bc3a N°4460 - Fix <code> contrast in Darkmoon 2023-03-02 16:36:06 +01:00
Molkobain
a0483738bc Merge remote-tracking branch 'origin/support/3.0' into develop 
# Conflicts:
#	core/dbobject.class.php
#	core/trigger.class.inc.php
 2023-02-28 21:54:40 +01:00
Molkobain
143410f4cd Merge remote-tracking branch 'origin/support/2.7' into support/3.0 
# Conflicts:
#	core/dbobject.class.php
 2023-02-28 15:20:07 +01:00
Pierre Goiffon
4cea418517 N°5893 - Log triggers exception in CRUD stack (#390) 
* Log TriggerOnObjectCreate crash

* Log TriggerOnObjectUpdate crash

* Log TriggerOnObjectDelete crash

* Factorize TriggerOnObject log

* \TriggerOnObject::LogException : do not replace not persisted yet object keys
 2023-02-28 15:13:28 +01:00
Molkobain
759b1825fe N°5918 - Fix activity panel disappearing when DoCheckToWrite fails 2023-02-28 13:33:47 +01:00
acognet
ba21687e5f Merge remote-tracking branch 'origin/support/3.0' into develop 
# Conflicts:
#	core/bulkchange.class.inc.php
 2023-02-28 12:34:47 +01:00
Anne-Catherine
370c1345d9 N°2916 - Import of IPv6 addresses fails when reconciliation is done on the IP (#382) 2023-02-28 12:08:32 +01:00
acognet
948cbb1446 Merge remote-tracking branch 'origin/support/3.0' into develop 2023-02-27 16:44:16 +01:00
Anne-Catherine
af8f06c8c3 N°5603 - Autocomplete fails with error for an external key pointing to an abstract class with no friendlyname (#375) 2023-02-27 16:18:36 +01:00
Pierre Goiffon
099a045852 Merge remote-tracking branch 'origin/support/3.0' into develop 2023-02-27 15:20:12 +01:00
Pierre Goiffon
bfe55183d0 N°6023 Fix error log 
Thanks @Hipska !
 2023-02-27 15:09:49 +01:00
Eric Espie
cf5fd3e2a8 N°5906 - CRUD Event - 🎨 rename event_listeners/listener XML nodes by event_listeners/event_listener 2023-02-27 11:23:55 +01:00
Eric Espie
bb62723114 N°5906 - CRUD Event - Fix listener launched twice and refactor calls to Tickets::UpdateImpactedItems() 2023-02-27 11:17:05 +01:00
Pierre Goiffon
937313c20e N°5906 - CRUD Event - Fix \DBObject::IsCrudStackEmpty not static 2023-02-27 11:17:05 +01:00
odain
939771aa15 N°6022 - Make synchro scripts work by http via token authentication with SYNCHRO scopes 2023-02-27 11:07:52 +01:00
Molkobain
70cbaeac7a Merge remote-tracking branch 'origin/support/3.0' into develop 2023-02-24 22:42:06 +01:00
Molkobain
b174e4cab3 N°4517 - PHP 8.1: Fix deprecated notice for null value passed to string parameter of native PHP functions 2023-02-24 22:40:17 +01:00
Molkobain
b1bd1e1677 PHPUnit: Migrate deprecated usages of assertFileNotExists() and assertRegExp() 2023-02-24 21:41:53 +01:00
Molkobain
029c01b13e Merge remote-tracking branch 'origin/support/3.0' into develop 2023-02-24 21:41:05 +01:00
Molkobain
61bd8b6bb4 N°4517 - PHP 8.1: Fix deprecated notice for null value passed to string parameter of native PHP functions 2023-02-24 21:40:10 +01:00
Pierre Goiffon
3a77423b38 Merge remote-tracking branch 'origin/support/3.0' into develop 
# Conflicts:
#	tests/php-unit-tests/unitary-tests/application/utilsTest.php
 2023-02-23 18:57:50 +01:00
Pierre Goiffon
5c9eb7fa38 N°6020 PHPUnit for \utils::EscapeHtml and EscapedHtmlDecode methods 
This will ensure conversion back and forth is working as expected (in other words, parameters to the php functions stays the same in both methods)
 2023-02-23 18:56:28 +01:00
Pierre Goiffon
4e8a1563f8 Merge remote-tracking branch 'origin/support/3.0' into develop 2023-02-23 18:38:39 +01:00
Pierre Goiffon
e960a4ad53 N°6023 Fix cannot load SVG files in AttributeImage since 3.0.0 (#449) 
Caused by merge error in ddd6bf2

Co-authored-by: Molkobain <lajarige.guillaume@free.fr>
 2023-02-23 18:38:03 +01:00