composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-21 09:38:48 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,752 Commits 135 Branches 134 Tags
c616e9b65f3ed681e5cb84bf48a4eeefcbbad34c
Commit Graph

7752 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Molkobain
c616e9b65f Remove swfobject.js from iTopWebPage as it was lost during previous merge 2020-10-08 14:38:34 +02:00
Stephen Abello
03418663f2 N°2847 Small scss fix to style JQuery UI modals 2020-10-08 13:30:31 +02:00
Stephen Abello
5a072c75eb N°2847 Fix object details width when using vertical tabs 2020-10-08 10:38:56 +02:00
Pierre Goiffon
10a945eb92 Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design 2020-10-07 18:48:56 +02:00
Pierre Goiffon
6239c29422 ✅ Fix tests 
3 files having wrong datamodel XML version
 2020-10-07 18:48:46 +02:00
Pierre Goiffon
bb53aef09f Merge remote-tracking branch 'origin/support/2.7' into develop 
# Conflicts:
#	application/datamodel.application.xml
 2020-10-07 18:37:06 +02:00
Stephen Abello
6cbc7fdb20 N°2847 Fix hardcoded values for Activity New Entry object 2020-10-07 17:01:44 +02:00
Stephen Abello
6a87ce48e1 N°2847 Renamed and moved files for Activity New Entry (thanks to @Molkobain comment on 157e0a6) 2020-10-07 17:01:44 +02:00
Stephen Abello
7770cb31fb N°2847 Add vertical tab options to object details 2020-10-07 17:01:44 +02:00
Pierre Goiffon
06acac97ba ✅ Fix tests 
* update datamodel XML version
* Remove \Combodo\iTop\Test\UnitTest\Core\OQLTest::testTypeErrorQueryParser
 2020-10-07 16:21:36 +02:00
Molkobain
3adcee6da8 Fix regression introduced in 3b6a03d703 2020-10-07 16:01:23 +02:00
Molkobain
ff3ade7d62 Missing parts of the previous merge 2020-10-07 15:32:18 +02:00
Molkobain
ad59e81144 N°2847 - Activity panel: Improve width when expanded 2020-10-07 13:33:38 +02:00
acognet
2d6d1132c7 N°3262 - Avoid PHP notices on DBObject core code 2020-10-07 13:26:38 +02:00
Molkobain
67ab33e727 Merge branch 'feature/backoffice-full-moon-design' of https://github.com/Combodo/iTop into feature/backoffice-full-moon-design 2020-10-07 13:25:12 +02:00
Molkobain
e81e3a0f1c Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design 2020-10-07 13:18:14 +02:00
Stephen Abello
e89afa163e N°2847 Remove RichText from preferences 2020-10-07 11:36:44 +02:00
Molkobain
e48d257b00 Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design 
# Conflicts:
#	application/ajaxwebpage.class.inc.php
#	application/csvpage.class.inc.php
#	application/displayblock.class.inc.php
#	application/itopwebpage.class.inc.php
#	application/utils.inc.php
#	application/webpage.class.inc.php
#	application/xmlpage.class.inc.php
#	datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
#	datamodels/2.x/itop-knownerror-light/datamodel.itop-knownerror-light.xml
#	datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
#	datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
#	js/components/breadcrumbs.js
#	pages/navigator.php
#	test/core/DBSearchTest.php
 2020-10-07 11:36:15 +02:00
BenGrenoble
51669d0479 Fix datamodel Navigation rules and module parameters 2020-10-07 11:08:11 +02:00
BenGrenoble
f983655c68 Fix datamodel Branding 2020-10-07 11:07:34 +02:00
Stephen Abello
157e0a6915 N°2847 Add backend for new entry form for activity panel 2020-10-07 09:46:23 +02:00
Pierre Goiffon
7d26b6092e Merge remote-tracking branch 'origin/support/2.7' into develop 
# Conflicts:
#	.idea/codeStyles/codeStyleConfig.xml
#	.idea/inspectionProfiles/Combodo.xml
 2020-10-06 10:42:55 +02:00
Molkobain
f5e92359d9 N°2847 - Form: Fix return type in Form::GetAction() 2020-10-05 17:13:32 +02:00
Molkobain
8994f82e0f N°2847 - Fieldset: Fix alignement/positionning with siblings, parent (also some renaming and variables extraction) 2020-10-05 17:03:17 +02:00
Molkobain
8551322cd7 N°2847 - Multi columns layout: Fix alignment with parent (also some renaming to match conventions) 2020-10-05 16:26:41 +02:00
acognet
ed0e16494d N°3335 - Fix test 2020-10-05 16:23:56 +02:00
Pierre Goiffon
a765eb8725 Merge remote-tracking branch 'origin/support/2.6' into support/2.7 
# Conflicts:
#	application/ajaxwebpage.class.inc.php
#	application/csvpage.class.inc.php
 2020-10-05 16:12:49 +02:00
Molkobain
be075dd695 N°2847 - Object details: Fix alert messages overlapping header and multicolumn layout 2020-10-05 15:53:45 +02:00
Eric
1f53757318 N°3248 - code hardening 
(cherry picked from commit 6a25933744)
(cherry picked from commit f74c78d61c)
 2020-10-05 14:54:17 +02:00
Pierre Goiffon
090119147c 🎨 PHP formatting 2020-10-05 14:42:03 +02:00
Pierre Goiffon
1551694198 N°3317 Security hardening 2020-10-05 14:42:03 +02:00
Molkobain
0691fca412 Add @since to newly created constants 2020-10-05 13:22:29 +02:00
Molkobain
3298966174 N°3279 - Change "user_id" from integer to external 2020-10-05 13:21:27 +02:00
Molkobain
79514358db N°2847 - Tab container: Fix some issues 
- Fix extra tabs list being behind the tab content
- Sanitize tab ID in the HTML
 2020-10-05 11:03:23 +02:00
Molkobain
aa38be4578 Improve JSDoc of IsElementVisibleToTheUser() 2020-10-05 11:03:22 +02:00
Molkobain
e911290b3d Improve utils::Sanitize() 
- Add class constants for $sSanitizationFilter values (You should use them instead of hard-coding the value, for example: utils::ENUM_SANIZATION_FILTER_XXX)
- Fix "element_identifier" filter of utils::Sanitize() to keep "-" character
- Add 'sanitize_identifier' filter to TWIG
 2020-10-05 11:03:22 +02:00
Molkobain
dc24bbcd97 N°2847 - Comment old history tab (waiting for decision on the DisplayBareHistory before removing it) 2020-10-05 08:45:12 +02:00
Molkobain
ea8a8e3afa N°2847 - Add lifecycle states default colors 2020-10-05 08:43:32 +02:00
Molkobain
6fb5d20971 N°2847 - Tab container: Improve global look & feel; responsive tabs. 2020-10-04 23:22:41 +02:00
Molkobain
b3522017e7 Add new JS helper to know if an element is visible to user 2020-10-04 18:37:12 +02:00
Molkobain
e5b22d270e N°2847 - Add SCSS helper for hyperlinks to inherit colors from their parent instead of being of the default color (brand primary) 2020-10-03 23:41:50 +02:00
Molkobain
b8af22baad N°2847 - Fix object details being too wide 2020-10-02 22:09:18 +02:00
Molkobain
5626da7a5e N°2847 - Object details: Preliminary work 
- Add ObjectFactory for ObjectDetails, ObjectCard, ...
- Update SCSS files to integrate its components

Note: A big part of the CSS is hardcoded in cmdbAbstract for now as we still need to discuss / work on the migration of the cmdbAbstract APIs (DisplayBareHeader, DisplayBareProperties, ...)
 2020-10-02 11:40:46 +02:00
Molkobain
79ad75a2c2 N°2847 - Panel: Fix padding / font size 2020-10-02 11:40:26 +02:00
Molkobain
41c833d0c6 N°2847 - Work on TabContainer: Move SCSS and HTML files to the layout folder 2020-10-02 11:40:26 +02:00
Molkobain
29f58103b0 N°2847 - Comment (temp) migrated parts of the iTopWebPage 2020-10-02 11:40:26 +02:00
Molkobain
15a9856f89 N°2847 - Rework of Panel block 
- Add 2 separate content areas (main and toolbar)
- Improve HTML template with header
- Prepare ObjectDetails block based on a panel
 2020-10-02 11:40:25 +02:00
Stephen Abello
b3bb77c8ee N°2847 Finish UX/UI for new caselog entry 2020-10-02 10:54:40 +02:00
Stephen Abello
c2fe1bc5cb N°2847 Add new entry form for activity panel (static atm) 2020-10-02 10:54:39 +02:00
BenGrenoble
5d7ae38adf Merge remote-tracking branch 'origin/support/2.7' into support/2.7 2020-10-02 10:51:59 +02:00