Eric
78c674a989
DBSearch serialization rework
2018-10-19 16:02:07 +02:00
Eric
84d9be3293
Strengthen the SQL creation from OQL
2018-10-19 15:58:50 +02:00
Eric
ada56da63e
Fix multiple TagSet creation in the same object
2018-10-19 11:16:34 +02:00
Pierre Goiffon
21c5638e1e
Merge branch 'support/2.5' into develop
...
# Conflicts:
# application/applicationextension.inc.php
# application/dashlet.class.inc.php
# application/itopwebpage.class.inc.php
# application/loginwebpage.class.inc.php
# application/menunode.class.inc.php
# application/nicewebpage.class.inc.php
# application/query.class.inc.php
# application/utils.inc.php
# application/webpage.class.inc.php
# application/wizardhelper.class.inc.php
# core/action.class.inc.php
# core/attributedef.class.inc.php
# core/cmdbchangeop.class.inc.php
# core/cmdbobject.class.inc.php
# core/cmdbsource.class.inc.php
# core/config.class.inc.php
# core/dbobject.class.php
# core/dbobjectsearch.class.php
# core/dbobjectset.class.php
# core/kpi.class.inc.php
# core/modelreflection.class.inc.php
# core/modulehandler.class.inc.php
# core/oql/expression.class.inc.php
# core/oql/oql-lexer.plex
# core/oql/oql-parser.y
# core/oql/oqlquery.class.inc.php
# core/ormpassword.class.inc.php
# core/sqlobjectquery.class.inc.php
# core/sqlquery.class.inc.php
# core/sqlunionquery.class.inc.php
# core/trigger.class.inc.php
# core/userrights.class.inc.php
# css/light-grey.scss
# datamodels/2.x/itop-backup/status.php
# datamodels/2.x/itop-config/config.php
# datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml
# datamodels/2.x/itop-knownerror-mgmt/en.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
# datamodels/2.x/itop-portal-base/portal/src/controllers/abstractcontroller.class.inc.php
# datamodels/2.x/itop-portal-base/portal/src/controllers/brickcontroller.class.inc.php
# datamodels/2.x/itop-portal-base/portal/src/controllers/browsebrickcontroller.class.inc.php
# datamodels/2.x/itop-portal-base/portal/src/controllers/createbrickcontroller.class.inc.php
# datamodels/2.x/itop-portal-base/portal/src/controllers/defaultcontroller.class.inc.php
# datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php
# datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php
# datamodels/2.x/itop-portal-base/portal/src/controllers/userprofilebrickcontroller.class.inc.php
# datamodels/2.x/itop-portal-base/portal/src/routers/abstractrouter.class.inc.php
# datamodels/2.x/itop-portal-base/portal/src/routers/browsebrickrouter.class.inc.php
# datamodels/2.x/itop-portal-base/portal/src/routers/createbrickrouter.class.inc.php
# datamodels/2.x/itop-portal-base/portal/src/routers/defaultrouter.class.inc.php
# datamodels/2.x/itop-portal-base/portal/src/routers/managebrickrouter.class.inc.php
# datamodels/2.x/itop-portal-base/portal/src/routers/objectrouter.class.inc.php
# datamodels/2.x/itop-portal-base/portal/src/routers/userprofilebrickrouter.class.inc.php
# datamodels/2.x/itop-portal/datamodel.itop-portal.xml
# datamodels/2.x/itop-tickets/en.dict.itop-tickets.php
# dictionaries/da.dictionary.itop.core.php
# dictionaries/da.dictionary.itop.ui.php
# dictionaries/en.dictionary.itop.core.php
# dictionaries/en.dictionary.itop.ui.php
# dictionaries/fr.dictionary.itop.core.php
# dictionaries/hu.dictionary.itop.core.php
# dictionaries/it.dictionary.itop.core.php
# dictionaries/nl.dictionary.itop.core.php
# dictionaries/pt_br.dictionary.itop.core.php
# dictionaries/tr.dictionary.itop.core.php
# dictionaries/zh.dictionary.itop.core.php
# js/forms-json-utils.js
# js/jquery-migrate-1.4.1.min.js
# js/jquery.layout.js
# js/jquery.layout.min.js
# js/jquery.tablesorter.pager.js
# js/linkswidget.js
# js/searchformforeignkeys.js
# js/utils.js
# js/wizardhelper.js
# pages/schema.php
# readme.txt
# setup/ajax.dataloader.php
# setup/xmldataloader.class.inc.php
# sources/renderer/bootstrap/fieldrenderer/bssubformfieldrenderer.class.inc.php
# sources/renderer/console/consoleformrenderer.class.inc.php
# sources/renderer/console/fieldrenderer/consoleselectobjectfieldrenderer.class.inc.php
# sources/renderer/console/fieldrenderer/consolesimplefieldrenderer.class.inc.php
# sources/renderer/console/fieldrenderer/consolesubformfieldrenderer.class.inc.php
# test/ItopDataTestCase.php
# test/core/ormLinkSetTest.php
# webservices/backoffice.dataloader.php
# webservices/rest.php
2018-10-18 14:34:22 +02:00
Pierre Goiffon
588899db63
Convert all files from CrLf to Lf (preparing merge to develop)
2018-10-18 14:20:40 +02:00
Molkobain
a37698a9de
Fix regression introduced in commit 10b7fa6 (Web queries have issue with line breaks in cell value)
2018-10-17 13:04:57 +02:00
Eric
f3f70d6296
N°1408 - Dashboard Printer friendly page + user edit rights
2018-10-15 16:37:18 +02:00
Eric
bf000e6a89
N°1408 - DBSearch Serialize refactor (json format)
2018-10-15 16:37:17 +02:00
Eric
709badd0f7
N°1408 - Support contextual parameters in attributes dashboard
2018-10-15 16:37:17 +02:00
Eric
99153d02ee
N°1408 - Support contextual parameters in attributes dashboard
2018-10-15 16:37:17 +02:00
Eric
c13b6ea13a
N°1408 - AttributeDashboard first implementation
2018-10-15 16:37:17 +02:00
Eric
6e5d4834f1
N°1408 - Move of the dashboard menu into the dashboard
2018-10-15 16:37:16 +02:00
steffunky
41a479b48d
N°1555: fixed a case where AttributeExternal field was pointing anything else than an ExternalKey and its label wouldn't show up on search criteria
2018-10-09 18:30:12 +02:00
steffunky
74a8c3f5bd
N°1555: fixed a case where AttributeExternal field was pointing anything else than an ExternalKey and its label wouldn't show up on search criteria, remove duplicate catch
2018-10-09 18:27:36 +02:00
steffunky
3347d32f2a
N°1555: fixed a case where AttributeExternal field was pointing anything else than an ExternalKey and its label wouldn't show up on search criteria
2018-10-09 18:25:48 +02:00
Molkobain
4a431be0a9
(Cherry picked from commit 5099060) N°1203 : Correctly use 'from' field for test email notifications
2018-10-08 17:43:55 +02:00
Pierre Goiffon
c9d73fc0c8
N°931 fix TagSet not saved on object creation
2018-10-05 17:12:58 +02:00
Pierre Goiffon
8720ac2b08
N°931 Fix import TagSet failing with multiple code values (using CLI with no_localize=1)
2018-10-05 09:18:23 +02:00
Pierre Goiffon
714fada9f0
N°931 Fix TagSet export : with format=spreadsheet codes where always returned (now uses codes or labels according to what was set)
2018-10-04 15:00:33 +02:00
Stephen
c0d83e96d8
Retrofit 2.5.1 fixes into develop ( 11308dc7, 1e0d654, 7fddd6ac, 12e9e453, cbe749af, 10b7fa60, c5f3598f, 396fc2cd)
2018-10-04 11:12:16 +02:00
Pierre Goiffon
1bf39aa092
N°931 fix XML export (node was always empty)
2018-10-03 10:53:34 +02:00
Pierre Goiffon
9f926fccd8
N°931 TagSet admin updates :
...
* when modifying tag, code field is read only if tag is used by at least one object
* "tag usage" tab : show only parent class
2018-10-02 16:36:49 +02:00
Guillaume Lajarige
1cf36a5d01
(Retrofit from develop 5e1452f9) N°1580 Portal: Default image of image attributes not correctly displayed in object forms.
2018-10-02 10:52:22 +02:00
Eric
af7e5eb03e
N°917: Display attcodes instead of labels in triggers and allow search on AttributeSet
2018-10-01 15:23:29 +02:00
Molkobain
cf9c1b52ed
N°931 Portal integration due to AttributeSet refactoring. UI still to be done.
2018-09-28 16:34:52 +02:00
Eric
d3b3c44cbd
N°917: Fix unit tests
2018-09-28 16:32:15 +02:00
Molkobain
edb25b6dca
N°931 Internal: Move AttributeTagSet class.
2018-09-28 15:49:00 +02:00
Eric
40355cb2d0
N°917: Fix refresh edit screen, avoid storing bad values in db
2018-09-28 12:08:35 +02:00
Eric
b52aaaadf2
N°917: Remove AttributeSet search
2018-09-28 12:08:34 +02:00
Pierre Goiffon
f55c0aa1c9
N°917: Fix TagSet search
2018-09-28 12:08:34 +02:00
Molkobain
333c51b0f9
N°931 Fix XSS in console.
2018-09-28 12:08:14 +02:00
Pierre Goiffon
96aaa0d8e1
N°931 TagSet in history : display "added" in bold and "removed" as striked
2018-09-28 10:33:17 +02:00
Eric
3a551e9cec
N°917: Restrict "Attribute...AttCodeSet" to existing attributes on database write
2018-09-27 17:14:26 +02:00
Eric
cf6693a534
N°931: Fix tag css class
2018-09-27 16:47:14 +02:00
Molkobain
5fa4b4cb88
Taxons: Rework of CSS & markup in the console (portal still to come).
2018-09-27 16:45:04 +02:00
Eric
58525f247e
N°917: AttributeDef CSS class
2018-09-27 15:57:08 +02:00
Eric
d78f19525e
N°917: AttributeDef CSS class
2018-09-27 15:40:00 +02:00
Eric
5559c8205f
Merge branch 'feature/AttributeSet' into feature/b931
...
# Conflicts:
# core/attributedef.class.inc.php
2018-09-27 15:29:27 +02:00
Eric
2a6a97526d
N°917: AttributeDef CSS class
2018-09-27 15:25:51 +02:00
Eric
29177ec86b
N°917: New AttributeQueryAttCodeSet and enhanced Query phrase book
2018-09-27 14:37:50 +02:00
Pierre Goiffon
6eaa7c0530
N°931 AttributeSet more generic CSS classes :
...
* more generic names
* use same classes in both view and edit
* in the scss file, 3 sections : attribute-set edition (with other field types styles), generic Selectize overridings, and styles for attribute-set items visualisation
2018-09-27 11:47:28 +02:00
Eric
2d24324dea
N°917: Fix AttributeClassState
2018-09-27 11:36:41 +02:00
Eric
ec597f697a
N°917: Adapt to generic widget for set
2018-09-27 11:04:20 +02:00
Eric
b5f7227ecd
N°917: Fix AttributeClassState
2018-09-27 10:49:33 +02:00
Eric
615adf8281
N°917: Trigger on delete
2018-09-27 10:49:32 +02:00
Eric
cb7bb3242a
N°917: New AttributeClassState for triggers on state (entering or leaving a state)
2018-09-27 10:49:30 +02:00
Eric
4b08eea998
N°931: Fix Label protection for tags
2018-09-27 10:49:29 +02:00
Eric
01551942b3
N°917: Fix Bulk modify for AttCodeSet
2018-09-27 09:11:03 +02:00
Eric
720d334053
N°917: AttributeClassAttCodeSet created
2018-09-27 09:11:02 +02:00
Molkobain
9397d1ac2e
Taxons: Add support in the portal (UI still to be done).
2018-09-26 17:13:55 +02:00
