Eric Espie
|
6098842d9f
|
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
# Conflicts:
# core/designdocument.class.inc.php
# lib/composer/autoload_files.php
# lib/composer/autoload_static.php
|
2024-03-19 14:06:24 +01:00 |
|
Eric Espié
|
2f30a0146e
|
N°6974 - Flatten classes in datamodel (#603)
* N°6974 - Flatten classes in datamodel
* N°6882 - LoadDelta() in lax/strict mode
* N°6974 - Flatten classes in datamodel
* N°6882 - LoadDelta() in lax/strict mode
* N°7186 - Code hardening
* N°6974 - Flatten classes in datamodel
* N°6660 and N°7318 - Support delete_if_exists and define_if_not_exists in XML injection
* N°6974 - Flatten classes in datamodel
* Apply suggestions from code review
* Update core/designdocument.class.inc.php
---------
Co-authored-by: Molkobain <lajarige.guillaume@free.fr>
|
2024-03-19 13:53:14 +01:00 |
|
Anne-Catherine
|
1394bc221d
|
N°3363 - Add favicon in branding (#522)
|
2024-02-28 09:59:11 +01:00 |
|
bdalsass
|
b46d4db8ff
|
N°6476 - Revert datamodel / compiler changes from N°5563 (#515)
|
2023-06-29 15:11:30 +02:00 |
|
Eric Espie
|
1b7529fcb9
|
N°6384 - Flag LinkedSet to specify that it has CheckToWrite constraint (more specific parameter name)
|
2023-06-09 10:21:47 +02:00 |
|
Eric Espie
|
191742c2a9
|
N°6384 - Flag LinkedSet to specify that it has CheckToWrite constraint (more specific parameter name)
|
2023-06-09 10:17:22 +02:00 |
|
Eric Espie
|
99e84e86cd
|
N°6384 - fix typo
|
2023-06-08 17:19:45 +02:00 |
|
Eric Espie
|
7ebf5a6dd4
|
N°6384 - Flag LinkedSet (Indirect) when CheckToWrite must be requested to Hosted Object
|
2023-06-08 17:07:01 +02:00 |
|
Molkobain
|
4d5d149079
|
N°1646 - Add unit tests
|
2023-06-07 19:53:12 +02:00 |
|
Eric Espie
|
c3bb995407
|
N°6324 - CRUD Event for one time treatment before creation and before update
|
2023-05-30 11:29:24 +02:00 |
|
Eric Espie
|
cf5fd3e2a8
|
N°5906 - CRUD Event - 🎨 rename event_listeners/listener XML nodes by event_listeners/event_listener
|
2023-02-27 11:23:55 +01:00 |
|
Molkobain
|
4203382920
|
N°2783 - Add support for custom zlists (#389)
|
2023-02-13 16:13:51 +01:00 |
|
Molkobain
|
1086eaaffe
|
N°3190 - Fix XML conversion unit test
|
2023-02-10 22:37:24 +01:00 |
|
bdalsass
|
2803f0be49
|
N°3190 - Add iTop design format compatibility converter
- Add converter for for display_style property
- Update php unit test to control conversion
|
2023-02-10 13:47:10 +01:00 |
|
Pierre Goiffon
|
13550fd643
|
N°5563 Relations XML : restore edit_mode node
There are (yet !) not change in the relations UI when in object is in edit mode, so we need to keep previous behaviors.
|
2023-01-18 18:11:02 +01:00 |
|
Eric Espie
|
6549c95d4f
|
N°4756 - Ease extensibility for CRUD operations : XML format migration
|
2023-01-17 10:17:11 +01:00 |
|
Molkobain
|
29e0df9bbc
|
Merge remote-tracking branch 'origin/support/3.0' into develop
# Conflicts:
# test/sources/application/Helper/WebResourcesHelperTest.php
# tests/php-unit-tests/ItopTestCase.php
# tests/php-unit-tests/composer.lock
# tests/php-unit-tests/unitary-tests/.make/release/DatamodelsXmlFilesTest.php
# tests/php-unit-tests/unitary-tests/application/UI/Base/Layout/NavigationMenuTest.php
# tests/php-unit-tests/unitary-tests/application/query/QueryTest.php
# tests/php-unit-tests/unitary-tests/core/DBSearchTest.php
# tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/BulkChangeExtKeyTest.inc.php
# tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/CRUD/DBObjectTest.php
# tests/php-unit-tests/unitary-tests/service/EventTest.php
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.0_to_3.1.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.0_to_3.1.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.input.xml
# tests/php-unit-tests/unitary-tests/sources/Application/Helper/WebResourcesHelperTest.php
# tests/php-unit-tests/unitary-tests/sources/Router/RouterTest.php
# tests/php-unit-tests/unitary-tests/sources/application/Helper/WebResourcesHelperTest.php
# tests/php-unit-tests/unitary-tests/webservices/ImportTest.inc.php
# tests/php-unit-tests/unitary-tests/webservices/RestTest.php
|
2023-01-11 15:55:08 +01:00 |
|
Molkobain
|
d177ee4a7f
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts:
# tests/manual-visual-tests/Backoffice/RenderAllUiBlocks.php
# tests/php-unit-tests/ItopDataTestCase.php
# tests/php-unit-tests/ItopTestCase.php
# tests/php-unit-tests/integration-tests/dictionaries-test/fr.dictionary.itop.core.KO.wrong_php
# tests/php-unit-tests/integration-tests/dictionaries-test/fr.dictionary.itop.core.OK.php
# tests/php-unit-tests/integration-tests/iTopModulesPhpVersionChecklistTest.php
# tests/php-unit-tests/integration-tests/iTopXmlVersionChecklistTest.php
# tests/php-unit-tests/phpunit.xml.dist
# tests/php-unit-tests/unitary-tests/application/SCSSCompilationTest.php
# tests/php-unit-tests/unitary-tests/application/Session/SessionTest.php
# tests/php-unit-tests/unitary-tests/application/ThemeHandlerTest.php
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/DO_NOT_CHANGE.css-variables.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/DO_NOT_CHANGE.light-grey.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/README.md
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/_included_file3.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/cross_reference1.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/cross_reference2.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/feature1/_feature1.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/included_file1.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/included_scss/included_file2.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/included_scss/included_file4.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/multi_imports.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/shortcut.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/shortcut2.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/simple_import.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/simple_import2.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/typography.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/css/ui-lightness/DO_NOT_CHANGE.jqueryui.scss
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/css/ui-lightness/images/ui-icons_1c94c4_256x240.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/css/ui-lightness/images/ui-icons_222222_256x240.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/css/ui-lightness/images/ui-icons_E87C1E_256x240.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/css/ui-lightness/images/ui-icons_F26522_256x240.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/css/ui-lightness/images/ui-icons_ffffff_256x240.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/ac-background.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/actions_right.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/bg.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/breadcrumb-separator.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/calendar.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/delete.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/desc.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/error.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/eye-closed-555.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/eye-closed-fff.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/eye-open-555.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/eye-open-fff.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/full-screen.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/green-header.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/green-square.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/indicator.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/info-mini.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/minus.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/ok.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/orange-header.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/plus.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/red-header.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/truncated.png
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/tv-collapsable-last.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/tv-collapsable.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/tv-expandable-last.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/tv-expandable.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/tv-item-last.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/testimages/images/tv-item.gif
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main.css
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main_imagemodified.css
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main_importmodified.css
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main_stylesheet.css
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main_testcompilethemes.css
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/main_varchanged.css
# tests/php-unit-tests/unitary-tests/application/theme-handler/expected/themes/basque-red/theme-parameters.json
# tests/php-unit-tests/unitary-tests/application/theme-handler/getimages/expected-getimages.json
# tests/php-unit-tests/unitary-tests/application/theme-handler/getimages/test-getimages.scss
# tests/php-unit-tests/unitary-tests/core/ActionEmailTest.php
# tests/php-unit-tests/unitary-tests/core/AttributeDefTest.inc.php
# tests/php-unit-tests/unitary-tests/core/AttributeURLDefaultPattern.php
# tests/php-unit-tests/unitary-tests/core/AttributeURLTest.php
# tests/php-unit-tests/unitary-tests/core/BulkChangeTest.inc.php
# tests/php-unit-tests/unitary-tests/core/CSVParserTest.php
# tests/php-unit-tests/unitary-tests/core/DBObjectTest.php
# tests/php-unit-tests/unitary-tests/core/DBSearchAddConditionPointingTo.php
# tests/php-unit-tests/unitary-tests/core/ExpressionEvaluateTest.php
# tests/php-unit-tests/unitary-tests/core/GetSelectFilterTest.php
# tests/php-unit-tests/unitary-tests/core/InlineImageTest.php
# tests/php-unit-tests/unitary-tests/core/Log/ExceptionLogTest.php
# tests/php-unit-tests/unitary-tests/core/Log/ExceptionLogTest/Exceptions.php
# tests/php-unit-tests/unitary-tests/core/Log/LogAPITest.php
# tests/php-unit-tests/unitary-tests/core/Log/LogFileNameBuilderTest.php
# tests/php-unit-tests/unitary-tests/core/LogAPITest.php
# tests/php-unit-tests/unitary-tests/core/LogFileNameBuilderTest.php
# tests/php-unit-tests/unitary-tests/core/MetaModelTest.php
# tests/php-unit-tests/unitary-tests/core/OQLTest.php
# tests/php-unit-tests/unitary-tests/core/UniquenessConstraintTest.php
# tests/php-unit-tests/unitary-tests/core/XMLDataLoaderTest.php
# tests/php-unit-tests/unitary-tests/core/dictApcuTest.php
# tests/php-unit-tests/unitary-tests/core/dictTest.php
# tests/php-unit-tests/unitary-tests/core/ormCaseLogTest.php
# tests/php-unit-tests/unitary-tests/core/ormPasswordTest.php
# tests/php-unit-tests/unitary-tests/core/ormStyleTest.php
# tests/php-unit-tests/unitary-tests/setup/MFCompilerTest.php
# tests/php-unit-tests/unitary-tests/setup/SubMFCompiler.php
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/1.7_to_1.6.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/1.7_to_1.6.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.6_to_1.7_2.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.6_to_1.7_2.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.7.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.7_to_1.6.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.7_to_1.6.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.7_to_1.6_2.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.7_to_1.6_2.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.7_to_3.0.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.7_to_3.0.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.0_to_1.7.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.0_to_1.7.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/Bug_4569.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/Bug_4569.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_deleted_to_deleted.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_deleted_to_deleted.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_deleted_to_in-definition.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_deleted_to_in-definition.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_deleted_to_not-in-definition.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_deleted_to_not-in-definition.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_in-definition_to_deleted.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_in-definition_to_deleted.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_in-definition_to_in-definition.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_in-definition_to_in-definition.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_in-definition_to_not-in-definition.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_in-definition_to_not-in-definition.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_not-in-definition_to_deleted.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_not-in-definition_to_deleted.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_not-in-definition_to_in-definition.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_not-in-definition_to_in-definition.input.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_not-in-definition_to_not-in-definition.expected.xml
# tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/MoveNode-samples/from_not-in-definition_to_not-in-definition.input.xml
# tests/php-unit-tests/unitary-tests/setup/ressources/datamodels/datamodel-branding.xml
# tests/php-unit-tests/unitary-tests/sources/application/Helper/WebResourcesHelperTest.php
# tests/php-unit-tests/unitary-tests/sources/application/status/StatusIncTest.php
# tests/php-unit-tests/unitary-tests/sources/application/status/status.php
# tests/php-unit-tests/unitary-tests/synchro/DataSynchroTest.php
|
2023-01-10 15:27:44 +01:00 |
|