Merge remote-tracking branch 'origin/master' into report_and_dimension_refactoring
Conflicts: core/Updates/0.4.2.php core/Updates/0.6.3.php core/Updates/1.2-rc1.php core/Updates/1.9-b9.php core/Version.php tests/PHPUnit/Fixture.php tests/PHPUnit/Fixtures/UITestFixture.php tests/PHPUnit/Integration/Core/JsProxyTest.php
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Affichage de
- .travis.yml 2 ajouts, 2 suppressions.travis.yml
- LEGALNOTICE 1 ajout, 1 suppressionLEGALNOTICE
- composer.json 1 ajout, 1 suppressioncomposer.json
- config/global.ini.php 1 ajout, 1 suppressionconfig/global.ini.php
- core/API/DataTableGenericFilter.php 22 ajouts, 0 suppressioncore/API/DataTableGenericFilter.php
- core/API/DataTableManipulator/LabelFilter.php 10 ajouts, 5 suppressionscore/API/DataTableManipulator/LabelFilter.php
- core/API/ResponseBuilder.php 7 ajouts, 1 suppressioncore/API/ResponseBuilder.php
- core/ArchiveProcessor.php 1 ajout, 1 suppressioncore/ArchiveProcessor.php
- core/Common.php 1 ajout, 1 suppressioncore/Common.php
- core/CronArchive.php 2 ajouts, 0 suppressioncore/CronArchive.php
- core/DataAccess/ArchiveWriter.php 1 ajout, 1 suppressioncore/DataAccess/ArchiveWriter.php
- core/Db/Schema/Mysql.php 1 ajout, 1 suppressioncore/Db/Schema/Mysql.php
- core/Log.php 4 ajouts, 2 suppressionscore/Log.php
- core/Period/Factory.php 1 ajout, 1 suppressioncore/Period/Factory.php
- core/Plugin/ControllerAdmin.php 2 ajouts, 2 suppressionscore/Plugin/ControllerAdmin.php
- core/Tracker/Action.php 3 ajouts, 1 suppressioncore/Tracker/Action.php
- core/Updater.php 18 ajouts, 1 suppressioncore/Updater.php
- core/Updates/0.2.10.php 7 ajouts, 7 suppressionscore/Updates/0.2.10.php
- core/Updates/0.2.12.php 2 ajouts, 2 suppressionscore/Updates/0.2.12.php
- core/Updates/0.2.13.php 1 ajout, 1 suppressioncore/Updates/0.2.13.php
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter