Pierre Goiffon
|
d8e2a1cc7c
|
Merge branch 'support/2.7' into develop
# Conflicts:
# README.md
# composer.json
# composer.lock
# core/cmdbsource.class.inc.php
# core/dbobject.class.php
# datamodels/2.x/combodo-db-tools/db_analyzer.class.inc.php
# datamodels/2.x/combodo-db-tools/dbtools.php
# datamodels/2.x/combodo-db-tools/dictionaries/zh_cn.dict.combodo-db-tools.php
# datamodels/2.x/itop-attachments/dictionaries/zh_cn.dict.itop-attachments.php
# datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php
# dictionaries/zh_cn.dictionary.itop.core.php
# dictionaries/zh_cn.dictionary.itop.ui.php
# lib/composer/InstalledVersions.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_static.php
# lib/composer/installed.php
# lib/composer/platform_check.php
# pages/ajax.render.php
# pages/csvimport.php
# setup/ajax.dataloader.php
# setup/index.php
# setup/setuputils.class.inc.php
# test/application/UtilsTest.php
|
2021-06-14 16:19:56 +02:00 |
|
Molkobain
|
88634bcd92
|
SCSS: Refactor .is-code by moving it to helper file and renaming it
|
2021-05-05 18:29:33 +02:00 |
|
Eric
|
3a9228d8d3
|
N°3569 - Fix DB Tools queries display
|
2021-03-25 16:36:43 +01:00 |
|
Molkobain
|
1514cd83ab
|
UIBlock: Change $aAdditionalCSSClasses methods to match app. conventions (parameters should be arrays, not space separated string)
Note: This had to be fixed on all calls to this, hence the number of modifications.
|
2021-01-21 12:59:30 +01:00 |
|
Eric
|
01c4dff035
|
Add UIBlocks to twig (Changed classes name)
|
2021-01-19 17:23:09 +01:00 |
|
Eric
|
21740123f4
|
Add UIBlocks to twig (generic parser and node)
# Conflicts:
# pages/run_query.php
# test/VisualTest/Backoffice/RenderAllUiBlocks.php
|
2021-01-18 12:09:07 +01:00 |
|