Eric
|
6817cfbeea
|
N°931: Integrity controls
|
2018-09-07 17:50:40 +02:00 |
|
Pierre Goiffon
|
f871581997
|
Merge branch 'develop' into feature/b931
# Conflicts:
# application/applicationextension.inc.php
# core/attributedef.class.inc.php
# core/cmdbchangeop.class.inc.php
# core/cmdbobject.class.inc.php
# core/dbobjectsearch.class.php
# core/oql/expression.class.inc.php
# core/oql/oql-lexer.plex
# core/oql/oql-parser.y
# core/oql/oqlquery.class.inc.php
# css/light-grey.scss
# datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml
# datamodels/2.x/itop-portal/datamodel.itop-portal.xml
# datamodels/2.x/itop-tickets/en.dict.itop-tickets.php
# dictionaries/en.dictionary.itop.core.php
# dictionaries/fr.dictionary.itop.core.php
# setup/xmldataloader.class.inc.php
# test/ItopDataTestCase.php
|
2018-09-04 18:02:51 +02:00 |
|
Pierre Goiffon
|
40a4e6d7b0
|
Fix files using CrLf, convert them to Lf to have the whole repo using Lf
Warn your git config (core.autocrlf = input or true)
|
2018-09-04 17:59:51 +02:00 |
|
Eric Espié
|
a03c553000
|
N°962: TagSet attribute definition dev (continued)
SVN:b931[6030]
|
2018-08-30 11:08:47 +02:00 |
|
Eric Espié
|
9631021f84
|
N°962: TagSet Attribute definition and values (with unit tests on values)
SVN:b931[6024]
|
2018-08-30 11:08:46 +02:00 |
|
Pierre Goiffon
|
bdb62de81c
|
N°931 new AttributeTag, handle field creation & update
SVN:trunk[6014]
|
2018-08-23 15:05:36 +00:00 |
|
Stephen Abello
|
8fe38b03f6
|
Added replacement for mcrypt removal in PHP 7.2, added stronger encryption options
SVN:trunk[5996]
|
2018-08-03 08:43:36 +00:00 |
|
Guillaume Lajarige
|
f458826643
|
Internal: Rename core english dictionary files to match standard convention.
SVN:trunk[5352]
|
2018-02-21 16:36:08 +00:00 |
|