Eric Espie
9c37d5c23e
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# application/applicationextension.inc.php
# application/cmdbabstract.class.inc.php
# core/dbobject.class.php
# core/kpi.class.inc.php
# core/metamodel.class.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_static.php
# tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php
2023-07-19 09:26:46 +02:00
Molkobain
3bd3081359
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# synchro/synchro_exec.php
2023-06-27 18:19:48 +02:00
Molkobain
5a33fb7a6a
N°6474 - Fix regression introduced by 70e6f707
2023-06-27 18:16:55 +02:00
Stephen Abello
29a90fe244
N°6474 - Fix undefined variable due to failed merge + refactoring
2023-06-27 16:55:25 +02:00
Eric Espie
62ed5adbc5
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# application/loginwebpage.class.inc.php
# composer.json
# lib/composer/installed.json
# lib/guzzlehttp/psr7/.github/workflows/ci.yml
# lib/guzzlehttp/psr7/.github/workflows/integration.yml
# lib/guzzlehttp/psr7/.github/workflows/static.yml
# lib/guzzlehttp/psr7/CHANGELOG.md
# lib/guzzlehttp/psr7/composer.json
# lib/guzzlehttp/psr7/src/MessageTrait.php
# tests/php-unit-tests/ItopDataTestCase.php
2023-06-07 17:45:50 +02:00
Eric Espie
0fbd41a884
Merge remote-tracking branch 'origin/support/2.7' into support/3.0 -> fix syntax error
2023-06-07 17:30:39 +02:00
Eric Espie
e76ada641f
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# application/loginbasic.class.inc.php
# application/loginexternal.class.inc.php
# application/loginform.class.inc.php
# application/loginurl.class.inc.php
# application/loginwebpage.class.inc.php
# composer.lock
# datamodels/2.x/authent-cas/src/CASLoginExtension.php
# lib/composer/autoload_real.php
# lib/composer/installed.php
# synchro/synchro_exec.php
# synchro/synchro_import.php
# tests/php-unit-tests/unitary-tests/application/utilsTest.php
2023-06-07 17:21:09 +02:00
Eric Espie
c596fa2967
N°6358 - Login API REST
2023-06-07 09:17:24 +02:00
Molkobain
04a80fcd39
N°6055 - Fix undefined offset error in synchro_exec.php ( #465 )
...
Co-authored-by: odain <olivier.dain@combodo.com >
2023-03-24 22:25:58 +01:00
Molkobain
c767ebe989
📝 Copyright year bump
2023-03-17 18:28:47 +01:00
Thomas Casteleyn
fc97491708
N°6105 - Cleanup unnecessary use of dirname(__FILE__) ( #453 )
2023-03-14 18:51:01 +01:00
Pierre Goiffon
099a045852
Merge remote-tracking branch 'origin/support/3.0' into develop
2023-02-27 15:20:12 +01:00
odain
939771aa15
N°6022 - Make synchro scripts work by http via token authentication with SYNCHRO scopes
2023-02-27 11:07:52 +01:00
Eric Espie
8940051c3d
N°5906 - CRUD Event - fire event EVENT_DB_LINKS_CHANGED when an n-n link is created/updated/deleted
2023-02-17 14:25:01 +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
Thomas Casteleyn
b593beb8c7
N°5867 Display binary data size in SynchroReplica details ( #286 )
2023-01-10 18:53:00 +01:00
acognet
7ec12f1e12
N°4517 - PHP 8.1: Replace htmlentities(***, ENT_QUOTES, 'UTF-8') with utils::EscapeHtml
2022-07-01 09:22:25 +02:00
Thomas Casteleyn
cbef9bb267
Allow binary data to be imported/synchronised with the synchro_import.php
2022-02-11 12:16:09 +01:00
Pierre Goiffon
67fa156c0e
Merge remote-tracking branch 'origin/support/2.7' into develop
...
# Conflicts:
# application/dashboard.class.inc.php
# core/action.class.inc.php
# datamodels/2.x/combodo-db-tools/dictionaries/es_cr.dict.combodo-db-tools.php
# datamodels/2.x/itop-attachments/dictionaries/es_cr.dict.itop-attachments.php
# datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
# datamodels/2.x/itop-core-update/dictionaries/es_cr.dict.itop-core-update.php
# datamodels/2.x/itop-hub-connector/dictionaries/es_cr.dict.itop-hub-connector.php
# datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-portal-base/dictionaries/es_cr.dict.itop-portal-base.php
# datamodels/2.x/itop-request-mgmt-itil/dictionaries/es_cr.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt/dictionaries/es_cr.dict.itop-request-mgmt.php
# datamodels/2.x/itop-sla-computation/dictionaries/es_cr.dict.itop-sla-computation.php
# datamodels/2.x/itop-storage-mgmt/dictionaries/es_cr.dict.itop-storage-mgmt.php
# datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php
# datamodels/2.x/itop-virtualization-mgmt/dictionaries/es_cr.dict.itop-virtualization-mgmt.php
# datamodels/2.x/itop-welcome-itil/es_cr.dict.itop-welcome-itil.php
# dictionaries/es_cr.dictionary.itop.core.php
# dictionaries/es_cr.dictionary.itop.ui.php
# pages/ajax.render.php
# setup/wizardsteps.class.inc.php
# synchro/synchro_import.php
2021-11-19 10:28:46 +01:00
Pierre Goiffon
06985d3cf2
N°4387 synchro_import restore previous set_time_limit call
...
Was changed in b1761e04https://github.com/kalessil/phpinspectionsea/blob/master/docs/control-flow.md#statement-could-be-decoupled-from-foreach ) seems to be a false positive ?
2021-11-08 16:14:19 +01:00
Eric Espie
4b8ef4f919
N°3572 - Fix Data Integrity tab results display
...
- fix synchrodatasource SQL definitions
- fix Hierarchical keys warnings due to bad parameters
2021-09-30 14:53:00 +02:00
acognet
7d0550879f
N°3910 - Polishing: data synchro
2021-09-14 09:09:36 +02:00
Pierre Goiffon
e53cab0d1d
🎨 fix param order for \CMDBSource::IsSameFieldTypes call + code formatting
2021-04-02 08:22:36 +02:00
odain
9177982592
PR #188 add testcase to cover data synchro regression
2021-04-01 18:11:24 +02:00
Denis
78d82528fc
Fix DBSchema update fails when an ENUM column contains values which are not / no longer part of the field definition ( #188 )
2021-04-01 12:13:52 +02:00
odain
71e64cd1dc
N°2713 - Allow read access to synchro errors for users with non-admin profile - fix when object not allowed
2021-03-30 10:34:44 +02:00
odain
62165a2a0d
N°2713 - Allow read access to synchro errors for users with non-admin profile - take into account allowed read action
2021-03-29 18:40:06 +02:00
odain
407a651e44
N°2713 - Allow read accès to synchro errors for users with non-admin profile - removing comment
2021-03-25 18:05:59 +01:00
odain
89205a66ad
N°2713 - Allow read accès to synchro errors for users with non-admin profile
2021-03-25 11:28:07 +01:00
Molkobain
8dd96ea636
Copyright year bump
2021-03-15 09:29:45 +01:00
Stephen Abello
a5c2e20a02
N°3570 Migrate Synchro replica page
2021-03-03 10:22:52 +01:00
Stephen Abello
175aebaa14
N°3570 Migrate Synchro data source page
2021-03-03 10:22:52 +01:00
nv35
a5052ef42b
🔊 Print data source id in synchro_exec output ( #183 )
...
As it is possible to execute multiple data source sync in one command run, print the corresponding data source name before its output.
2021-02-11 16:47:10 +01:00
Pierre Goiffon
b85b4d0067
N°3663 Group exception classes in /application/exceptions
...
Original files kept for compatibility issues :
- core/coreexception.class.inc.php
There are remaining exceptions in /core/oql, but those files are generated
2021-01-26 15:50:26 +01:00
Eric
291041610b
set_time_limit accept only int in PHP7.4
2020-11-12 10:57:13 +01:00
Pierre Goiffon
745e4aa424
Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design
...
# Conflicts:
# webservices/import.php
2020-09-18 10:48:34 +02:00
Thomas Casteleyn
0542a8e4f8
Synchro cleanup ( #157 )
...
* Cleanup duplicate code
* Document undocumented parameter
* Removed duplicate code for consistency
2020-09-14 09:53:40 +02:00
rquetiez
f5a3bb2baa
N°3251 - Null in data synchro (fixes the regression introduced in a1f5d80)
...
- restore the initial behavior, thanks to hipska through PR#166
- refactor so as to make it clear that no SQL injection is possible (and will never be)
- add PHPUnit tests on the data synchronization => up to 20s to execute
- fix utils::ExeciTopScript to alow its usage within the automated test
2020-09-09 22:41:13 +02:00
Eric
63f8ec594c
N°2847 - Refactor Web Pages classes - Add UIBlockManager to the WebPage
2020-09-09 18:10:06 +02:00
rquetiez
a1f5d8041e
N°3251 (see also PR#152) - CSV data synchro allows "<NULL>" to be interpreted as "Let the attribute unchanged for the current row"
2020-08-13 21:49:30 +02:00
Pierre Goiffon
b7136c0b7a
N°2214 Add PHP check in CLI scripts
...
It is quite common that the PHP interpreter that is launched in CLI is different that the one used by the webserver. So iTop code launched by CLI could run in a context that doesn't meet iTop requirements !
This adds in the following scripts the same control that is done on the setup wizard first step :
* cron.php
* backup, check-backup
* export, exportv2
* bulk import
* synchro-exec, synchro-import
If the check throws at least one error then the script is stopped with an appropriate message, and a log is made (IssueLog, Error level, CLI channel)
(cherry picked from commit c768e18e2b
2020-06-15 15:20:17 +02:00
Pierre Goiffon
8912618732
Revert "N°2214 Add PHP check in CLI scripts"
...
This reverts commit c768e18e2b
2020-06-15 15:18:26 +02:00
Pierre Goiffon
c768e18e2b
N°2214 Add PHP check in CLI scripts
...
It is quite common that the PHP interpreter that is launched in CLI is different that the one used by the webserver. So iTop code launched by CLI could run in a context that doesn't meet iTop requirements !
This adds in the following scripts the same control that is done on the setup wizard first step :
* cron.php
* backup, check-backup
* export, exportv2
* bulk import
* synchro-exec, synchro-import
If the check throws at least one error then the script is stopped with an appropriate message, and a log is made (IssueLog, Error level, CLI channel)
2020-06-12 16:46:37 +02:00
bruno DA SILVA
21c2574cd9
N°2358 - Fix deletion of a single replica within a list
2020-05-13 09:37:36 +02:00
Pierre Goiffon
07b8830436
N°2814 Fix cannot authenticate in some HTTP calls
...
basic mode was forced in 0dd1f26b
2020-03-02 11:56:00 +01:00
Eric
900e8ac6d7
N°985 - Add applicable contexts on Trigger
2020-01-20 15:50:08 +01:00
Molkobain
4400cfde62
N°2313 - Markup extensibility: Update usages of admin. console tabs to have codes and titles
2020-01-15 08:42:35 +01:00
Pierre Goiffon
1877cb5e93
N°2614 Fix datasynchro error when running synchro_import.php
2019-12-04 11:08:18 +01:00
Pierre Goiffon
09fb99ed58
Rollback 2f431a0d : might not be a typo, we don't want to cause trouble close to a beta version O:)
2019-11-26 17:31:41 +01:00
Pierre Goiffon
0ee77d8c88
N°2163 DB*Tracked methods : modifications after review with Romain
...
Previous commit : 24eb82d1
2019-11-25 14:58:59 +01:00
