mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-20 09:08:42 +02:00
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts: # core/cmdbsource.class.inc.php # core/config.class.inc.php # core/displayablegraph.class.inc.php # core/log.class.inc.php # datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php # datamodels/2.x/itop-knownerror-mgmt/dictionaries/tr.dict.itop-knownerror-mgmt.php # datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php # datamodels/2.x/itop-tickets/tr.dict.itop-tickets.php # datamodels/2.x/itop-welcome-itil/tr.dict.itop-welcome-itil.php # dictionaries/tr.dictionary.itop.core.php # dictionaries/tr.dictionary.itop.ui.php # pages/UI.php # setup/itopdesignformat.class.inc.php # test/core/LogAPITest.php # test/integration/iTopModulesPhpVersionChecklistTest.php # test/postbuild_integration/SetupCssIntegrityChecklistTest.php # test/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php # test/status/StatusTest.php
This commit is contained in:
@@ -25,7 +25,7 @@
|
||||
* To test migration methods check {@link \Combodo\iTop\Test\UnitTest\Setup\TestForITopDesignFormatClass}
|
||||
*
|
||||
* Usage:
|
||||
*
|
||||
*
|
||||
* $oDocument = new DOMDocument();
|
||||
* $oDocument->load($sXMLFile);
|
||||
* $oFormat = new iTopDesignFormat($oDocument);
|
||||
@@ -59,31 +59,31 @@ class iTopDesignFormat
|
||||
'next' => '1.3',
|
||||
'go_to_next' => 'From12To13',
|
||||
),
|
||||
'1.3' => array(
|
||||
'1.3' => array( // iTop >= 2.2.0
|
||||
'previous' => '1.2',
|
||||
'go_to_previous' => 'From13To12',
|
||||
'next' => '1.4',
|
||||
'go_to_next' => 'From13To14',
|
||||
),
|
||||
'1.4' => array(
|
||||
'1.4' => array( // iTop >= 2.4.0
|
||||
'previous' => '1.3',
|
||||
'go_to_previous' => 'From14To13',
|
||||
'next' => '1.5',
|
||||
'go_to_next' => 'From14To15',
|
||||
),
|
||||
'1.5' => array(
|
||||
'1.5' => array( // iTop >= 2.5.0
|
||||
'previous' => '1.4',
|
||||
'go_to_previous' => 'From15To14',
|
||||
'next' => '1.6',
|
||||
'go_to_next' => 'From15To16',
|
||||
),
|
||||
'1.6' => array(
|
||||
'1.6' => array( // iTop >= 2.6.0
|
||||
'previous' => '1.5',
|
||||
'go_to_previous' => 'From16To15',
|
||||
'next' => '1.7',
|
||||
'go_to_next' => 'From16To17',
|
||||
),
|
||||
'1.7' => array(
|
||||
'1.7' => array( // iTop >= 2.7.0
|
||||
'previous' => '1.6',
|
||||
'go_to_previous' => 'From17To16',
|
||||
'next' => '3.0',
|
||||
|
||||
Reference in New Issue
Block a user