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
|
e58bc738d0
|
N°931: TagSet : Parsing OQL
|
2018-08-31 15:58:55 +02:00 |
|
Pierre Goiffon
|
d40ffd944f
|
Revert "@@@@ OQL parsing"
This reverts commit 0beafc1e9a7c4a629a458aec669aa5e11b27db49.
SVN:b931[6027]
|
2018-08-30 11:08:47 +02:00 |
|
Pierre Goiffon
|
5e7db7a27e
|
@@@@ OQL parsing
SVN:b931[6025]
|
2018-08-30 11:08:46 +02:00 |
|
Denis Flaven
|
7b8b469f5a
|
Added a version number (arbitrary initialized to 2015-08-31 for iTop v2.2.0) to the OQL Lexer/parser.
SVN:trunk[3801]
|
2015-10-12 09:52:39 +00:00 |
|
Romain Quetiez
|
7a5bbd0613
|
Integrated the lexer/parser build tools (Lexer=0.4.0, Parser=0.1.7)
SVN:trunk[3590]
|
2015-06-10 13:23:03 +00:00 |
|