Commit Graph

8055 Commits

Author SHA1 Message Date
odain
916f9b367e Merge branch 'feature/restapi-pass-jsondata-asfile2' into develop 2020-12-14 23:22:52 +01:00
odain
c6816318a9 N°3455: test when no json_data is passed 2020-12-14 23:19:54 +01:00
Eric
9df80b9f79 N°3123 - Fix table counts on search results 2020-12-14 18:31:32 +01:00
odain
59e9cdbfe6 N°3455: review with Romain (new code documented) 2020-12-14 18:23:31 +01:00
odain
7f0e8abc09 N°3455: clean code + test after review 2020-12-14 18:22:15 +01:00
Eric
c106caf924 N°3123 - Fix dashlets GroupBy and Object List 2020-12-14 16:37:23 +01:00
Pierre Goiffon
c06e176d57 Templates : remove auto closing tags
We are not using XHTML anymore but HTML 5
2020-12-14 16:29:57 +01:00
Pierre Goiffon
62bb0b9b78 Improve RenderAllUiBlocks 2020-12-14 15:42:56 +01:00
Eric
70beeb726a N°3123 - Fix "view_link" parameter for shortcuts preferences 2020-12-14 09:54:01 +01:00
acognet
c173f0b5d6 N°3123 : Fix create shortcuts and set preferences 2020-12-14 09:23:12 +01:00
acognet
43a2b5cda6 N°3123 : Fix create shortcuts and set preferences 2020-12-11 19:23:35 +01:00
Pierre Goiffon
17cecde604 Fix errors in setup/modelfactory.class.inc.php 2020-12-11 10:49:41 +01:00
Pierre Goiffon
728c09d97d N°3129 Fix compatibility with PHP 8 for \MFElement::ReplaceWith
New method added in PHP 8 : \DOMChildNode::replaceWith with a different signature (both visibility and parameters)
2020-12-11 10:13:10 +01:00
acognet
eb89c52bae N°3123 : Fix create shortcuts 2020-12-11 10:08:57 +01:00
Pierre Goiffon
e3895f284b N°3512 fix setup crashing if env-production doesn't exist 2020-12-11 09:26:19 +01:00
Pierre Goiffon
50342b6dfe Update compiled CSS 2020-12-10 18:28:03 +01:00
Pierre Goiffon
96e7f57a34 Merge remote-tracking branch 'origin/support/2.7' into develop
# Conflicts:
#	application/ajaxwebpage.class.inc.php
#	application/csvpage.class.inc.php
#	application/itopwebpage.class.inc.php
#	application/webpage.class.inc.php
#	application/xmlpage.class.inc.php
#	core/config.class.inc.php
#	css/css-variables.scss
#	datamodels/2.x/version.xml
#	pages/ajax.document.php
#	pages/ajax.render.php
#	pages/ajax.searchform.php
#	sources/application/TwigBase/Controller/Controller.php
2020-12-10 18:08:11 +01:00
Molkobain
abf6d5422e Merge remote-tracking branch 'origin/feature/faf-cke-mentions' into develop 2020-12-10 17:50:07 +01:00
Eric
2bef89137e N°3123 - DataTables rework (WIP) 2020-12-10 17:13:15 +01:00
Stephen Abello
a0ac1c70a9 N°2847 * Update CKeditor to 4.15.1
* Add iTop default languages to ckeditor
* Change CKeditor skin from flat to Moono-Lisa
2020-12-10 12:12:13 +01:00
Stephen Abello
1ccabe645b N°2847 * Update CKeditor to 4.15.1
* Add iTop default languages to ckeditor
* Change CKeditor skin from flat to Moono-Lisa
2020-12-10 11:18:09 +01:00
Pierre Goiffon
b03c5232b0 N°3253 Fix setup error message
Thanks @Hipska and @Molkobain !
2020-12-10 10:31:58 +01:00
Molkobain
97c77b612e N°2875 - Add config. param. 'mentions.allowed_classes' to choose which classes (eg. Person / FunctionalCI) can be mentioned through which char. (eg. @ / #) 2020-12-10 10:27:34 +01:00
Molkobain
e96400c43b N°2875 - Improve global implementation and integration with the trigger system 2020-12-09 23:19:39 +01:00
Molkobain
c22f019ea1 N°2847 - Add data-[role|object-class|object-id] attributes to the HTML sanitizer white list for anchors 2020-12-09 22:23:37 +01:00
Molkobain
bc3c46b566 N°2847 - Rework ckeditor SCSS to proper files and variables 2020-12-09 22:08:46 +01:00
Molkobain
a8431c5810 N°2875 - Update branch to current develop branch state 2020-12-09 20:06:40 +01:00
Molkobain
68332896ad Merge branch 'develop' into feature/faf-cke-mentions
# Conflicts:
#	application/cmdbabstract.class.inc.php
#	css/css-variables.scss
#	css/light-grey.scss
#	datamodels/2.x/installation.xml
2020-12-09 19:58:26 +01:00
Stephen Abello
dbda9512e5 N°2560 Prevent double submit on forms 2020-12-09 15:48:06 +01:00
Pierre Goiffon
c4756e8cec Upgrade version n° 2020-12-08 18:47:24 +01:00
Eric
b8a42843e0 N°3123 - DisplayBock BlockCvs 2020-12-08 16:29:16 +01:00
acognet
10c3f9f633 N°3123 : Improved JavaScript management in web pages and ajax pages - fix for datatable 2020-12-08 11:04:46 +01:00
Eric
05e802b74a N°3123 - Fix create new object link 2020-12-08 10:13:05 +01:00
acognet
0c8d78d753 N°3123 : refactoring ajax call for datatables 2020-12-08 09:38:24 +01:00
acognet
5ccb12453a N°3123 : Improved JavaScript management in web pages and ajax pages 2020-12-08 08:59:25 +01:00
odain
37351d6b3e N°3464: fix ci 2.7.3 2020-12-07 16:23:17 +01:00
odain
57a085eec1 N°3464: move fix in itop-fence + fix/enhance rest api test 2020-12-07 15:56:35 +01:00
Eric
0808a76226 N°3123 - Fix empty popup menus 2020-12-07 14:29:01 +01:00
odain
0019595923 N°3464: fix ci 2020-12-07 00:44:39 +01:00
odain
4d61c14f80 N°3464 add test in phpunit.xml.dit to validate the fix 2020-12-07 00:12:31 +01:00
odain
cf1b613923 N°3464 REST comment field not working anymore 2020-12-06 23:54:27 +01:00
Molkobain
815b2e1670 N°2847 - Restore components/layouts SCSS files to keep matching SCSS conventions 2020-12-04 23:03:17 +01:00
Pierre Goiffon
c46b046254 N°3253 Fix setup always displaying an error
Woops this was a debug I forgot to change
2020-12-04 18:30:28 +01:00
Pierre Goiffon
70efa37109 N°3253 Fix setup crashing on incompatible PHP versions (#178)
We now have a new setup landing page. The old one is renamed setup/wizard.php

This contains revert for "🐛 Fix setup homepage error with PHP < 7.1.0" (91c6916d86) => it was one of the modifications that caused the setup to crash before this !
2020-12-04 18:28:39 +01:00
Stephen Abello
13d2699011 N°2629 Allow user to choose default expanded/collapsed toolbar for richtext editors 2020-12-04 10:53:22 +01:00
Pierre Goiffon
1304e2eb2d N°3416 Updates after code review v2 :) 2020-12-04 08:51:07 +01:00
Pierre Goiffon
3cf16627c1 Merge remote-tracking branch 'origin/support/2.6' into support/2.7
# Conflicts:
#	pages/ajax.render.php
2020-12-03 18:18:36 +01:00
Pierre Goiffon
4aaa237bf9 🔖 Prepare 2.7.3 version 2020-12-03 18:15:58 +01:00
Pierre Goiffon
cece15d10c N°3416 Updates after code review
Many thanks @bruno-ds !
* add comments to explain intentions
* fix indentations
2020-12-03 17:45:44 +01:00
Stephen Abello
cc6e9492fd N°2847 Fix blocks import paths in notifications following directories refactor 2020-12-03 15:26:40 +01:00