Pierre Goiffon
5fee2438ab
Fix comments : iTop 2.8.0 renamed to 3.0.0
2020-10-14 09:06:07 +02:00
Pierre Goiffon
5b2c279eac
Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design
...
# Conflicts:
# js/components/breadcrumbs.js
2020-10-12 12:51:05 +02:00
Pierre Goiffon
72fc22c49a
Merge remote-tracking branch 'origin/support/2.7' into develop
2020-10-12 12:49:17 +02:00
Pierre Goiffon
2d130cbba8
Merge remote-tracking branch 'origin/support/2.6' into support/2.7
...
# Conflicts:
# test/core/UserRightsTest.php
# test/setup_params/default-params.xml
2020-10-12 12:47:58 +02:00
Pierre Goiffon
8b1c20cc11
N°3332 Security hardening
2020-10-12 12:40:51 +02:00
Molkobain
b7b1ef1a1f
Fix double-encoded breadcrumbs entry introduced by 1e634a8bba
2020-10-09 20:54:51 +02:00
Molkobain
64a96ac001
N°2847 - Dashboard: Improve grid alignments and design of the badge dashlet
2020-10-09 18:42:53 +02:00
Thomas Casteleyn
eb3ad0999a
Cleanup utils::GetSessionLog() ( #172 )
2020-10-09 15:59:24 +02:00
odain
df5aacca42
💚 use new ci validation
2020-10-09 10:08:31 +02:00
Molkobain
ecf678f39f
N°2847 - Quick create: Refactor history truncation
2020-10-09 09:49:26 +02:00
Molkobain
5bc01d3950
N°2847 - Global search: Add config. parameter for max. history results ('global_search.max_history_results')
2020-10-09 09:49:26 +02:00
Stephen Abello
2ae50dfb06
N°2847 Fix Activity new entry form caselog picker disappearing after submitting once
2020-10-09 09:26:39 +02:00
Stephen Abello
b25a6a2f04
N°2847 Correctly open/close Activity new entry form
2020-10-09 09:26:39 +02:00
Molkobain
1bd9d35979
N°2847 - Quick create: Add config. parameter for max. history results ('quick_create.max_history_results')
2020-10-09 09:21:37 +02:00
Molkobain
1dd4d1479c
N°2847 - Tab container: Fix min width (alignment with medallion) with short tab labels
2020-10-09 00:06:21 +02:00
Molkobain
00212e8127
N°2847 - Dashboard: Start rework for demo
2020-10-09 00:04:13 +02:00
Molkobain
061f3e9f51
N°2847 - Quick create: Add config. parameter for max. autocomplete results ('quick_create.max_autocomplete_results')
2020-10-08 18:17:35 +02:00
Stephen Abello
e6111609b0
N°3208 Finish Quick object creation component
2020-10-08 17:15:27 +02:00
Molkobain
3556a95f3b
N°2847 - Tab container: Fix tab content horizontal alignment
2020-10-08 17:01:59 +02:00
Pierre Goiffon
82735254e7
Compiled CSS
...
As generated by the setup
2020-10-08 16:27:05 +02:00
Molkobain
44351784e6
N°2847 - Work on the tab container
...
- Fix CSS class names on vertical mode
- Add class constants
2020-10-08 16:25:45 +02:00
Molkobain
f87002dce3
Introduce CombodoBackofficeToolbox like in the portal to:
...
- Avoid name collision with other libs for our functions
- Document a set a function developers can use in their extensions, will be completed as things progress
2020-10-08 15:06:22 +02:00
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
