Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 76fcbebcc6a489c6a25a7747bd5453004c572bba https://github.com/phpmyadmin/phpmyadmin/commit/76fcbebcc6a489c6a25a7747bd54... Author: Lalu-Ahirwar lalu.ahi@gmail.com Date: 2017-07-31 (Mon, 31 Jul 2017)
Changed paths: M po/hi.po
Log Message: ----------- Translated using Weblate (Hindi)
Currently translated at 37.3% (1198 of 3205 strings)
[CI skip]
Commit: 31797657c4a7ff570971c710a03c8241b1d55900 https://github.com/phpmyadmin/phpmyadmin/commit/31797657c4a7ff570971c710a03c... Author: Weblate noreply@weblate.org Date: 2017-07-31 (Mon, 31 Jul 2017)
Changed paths: M ChangeLog M libraries/plugins/export/ExportSql.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7
Commit: aea00fb90f3594371569b0201d57b8bd63b59eaa https://github.com/phpmyadmin/phpmyadmin/commit/aea00fb90f3594371569b0201d57... Author: Michal Čihař michal@cihar.com Date: 2017-08-01 (Tue, 01 Aug 2017)
Changed paths: M .travis.yml
Log Message: ----------- Add PHP 7.2 to test matrix
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 4b037582d9ac1686f2c4ba5e05d4ab61729d570a https://github.com/phpmyadmin/phpmyadmin/commit/4b037582d9ac1686f2c4ba5e05d4... Author: Michal Čihař michal@cihar.com Date: 2017-08-01 (Tue, 01 Aug 2017)
Changed paths: M libraries/import.lib.php
Log Message: ----------- Avoid counting null (default) value
Signed-off-by: Michal Čihař michal@cihar.com
Commit: e85fc1cdffe01aa69684f3612ab0a9d2c0a2f363 https://github.com/phpmyadmin/phpmyadmin/commit/e85fc1cdffe01aa69684f3612ab0... Author: Michal Čihař michal@cihar.com Date: 2017-08-01 (Tue, 01 Aug 2017)
Changed paths: M test/classes/TableTest.php
Log Message: ----------- Fix mocked value
Signed-off-by: Michal Čihař michal@cihar.com
Commit: f96886a445a51c627c49d77d11bd8da00bfb5115 https://github.com/phpmyadmin/phpmyadmin/commit/f96886a445a51c627c49d77d11bd... Author: Michal Čihař michal@cihar.com Date: 2017-08-01 (Tue, 01 Aug 2017)
Changed paths: M libraries/plugin_interface.lib.php
Log Message: ----------- Fix check for null
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 53613a402c1c6e546cc44b447bd419d73b22540e https://github.com/phpmyadmin/phpmyadmin/commit/53613a402c1c6e546cc44b447bd4... Author: Michal Čihař michal@cihar.com Date: 2017-08-01 (Tue, 01 Aug 2017)
Changed paths: M test/libraries/PMA_display_export_test.php
Log Message: ----------- Add missing mock
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 456ec18cb1d1cd5477dee6f70af26b533cda657c https://github.com/phpmyadmin/phpmyadmin/commit/456ec18cb1d1cd5477dee6f70af2... Author: Michal Čihař michal@cihar.com Date: 2017-08-01 (Tue, 01 Aug 2017)
Changed paths: M test/libraries/PMA_insert_edit_test.php
Log Message: ----------- Add missing mock
Signed-off-by: Michal Čihař michal@cihar.com
Commit: fc2ac9f4c66f6fa0484ba803c2926f3fbd97371d https://github.com/phpmyadmin/phpmyadmin/commit/fc2ac9f4c66f6fa0484ba803c292... Author: Michal Čihař michal@cihar.com Date: 2017-08-01 (Tue, 01 Aug 2017)
Changed paths: M libraries/Advisor.php
Log Message: ----------- Hide differences in PHP 7.2 error reporting
It adds (this will throw an Error in a future version of PHP) to undefined constant error.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: b188c18fb03fe6865290adbfff2108f7d86b541f https://github.com/phpmyadmin/phpmyadmin/commit/b188c18fb03fe6865290adbfff21... Author: Michal Čihař michal@cihar.com Date: 2017-08-01 (Tue, 01 Aug 2017)
Changed paths: M test/libraries/PMA_PMD_common_test.php
Log Message: ----------- Fix mocked return value
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 76e0e6dbc8002c13274f21090ccd08661c7885ce https://github.com/phpmyadmin/phpmyadmin/commit/76e0e6dbc8002c13274f21090ccd... Author: Michal Čihař michal@cihar.com Date: 2017-08-01 (Tue, 01 Aug 2017)
Changed paths: M libraries/properties/options/OptionsPropertyGroup.php M test/classes/properties/options/groups/OptionsPropertyRootGroupTest.php
Log Message: ----------- Implement Countable interface in OptionsPropertyGroup
This is really needed in OptionsPropertyRootGroup, but makes sense here as well.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 73181a26c161bd1d6c7168e8fbe32b956c7237ad https://github.com/phpmyadmin/phpmyadmin/commit/73181a26c161bd1d6c7168e8fbe3... Author: Michal Čihař michal@cihar.com Date: 2017-08-01 (Tue, 01 Aug 2017)
Changed paths: M libraries/plugins/auth/AuthenticationSignon.php
Log Message: ----------- Do not manipulate with session settings when running tests
Those can't be executed on PHP 7.2 after headers have been sent.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 738b35b4ecc87f059419ac05df84adfffeb1fd7f https://github.com/phpmyadmin/phpmyadmin/commit/738b35b4ecc87f059419ac05df84... Author: Michal Čihař michal@cihar.com Date: 2017-08-01 (Tue, 01 Aug 2017)
Changed paths: M test/install-runkit
Log Message: ----------- Avoid runkit installation on PHP 7.2
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 70e9349936315970fd6a5a3043324bccc0dd45c2 https://github.com/phpmyadmin/phpmyadmin/commit/70e9349936315970fd6a5a304332... Author: Michal Čihař michal@cihar.com Date: 2017-08-01 (Tue, 01 Aug 2017)
Changed paths: M ChangeLog
Log Message: ----------- Changelog entry for #13414
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 0348c8b36d5fb97955031c76b56a7d127b3488c6 https://github.com/phpmyadmin/phpmyadmin/commit/0348c8b36d5fb97955031c76b56a... Author: Michal Čihař michal@cihar.com Date: 2017-08-01 (Tue, 01 Aug 2017)
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_7'
Commit: 4a83171c304476b3cfbcbfa4f2e8449c49816aee https://github.com/phpmyadmin/phpmyadmin/commit/4a83171c304476b3cfbcbfa4f2e8... Author: Michal Čihař michal@cihar.com Date: 2017-08-01 (Tue, 01 Aug 2017)
Changed paths: M .travis.yml M ChangeLog M libraries/classes/Plugins/Auth/AuthenticationSignon.php M libraries/classes/Properties/Options/OptionsPropertyGroup.php M libraries/import.lib.php M libraries/plugin_interface.lib.php M test/classes/TableTest.php M test/classes/properties/options/groups/OptionsPropertyRootGroupTest.php M test/install-runkit M test/libraries/PMA_PMD_common_test.php M test/libraries/PMA_display_export_test.php M test/libraries/PMA_insert_edit_test.php
Log Message: ----------- Merge branch 'QA_4_7'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c146127b7337...4a83171c3044
-
Michal Čihař