- Git - lists.phpmyadmin.net

[phpmyadmin/scripts] 03bd80: Add git merge options to allow non interactive run
by Michal Čihař 17 Jul '17

17 Jul '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/scripts Commit: 03bd80d67e58de3e71446af0a5560f2492c963d7 https://github.com/phpmyadmin/scripts/commit/03bd80d67e58de3e71446af0a5560f… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M website/daily-composer Log Message: ----------- Add git merge options to allow non interactive run There might be conflicting changes (eg. README.rst on release) and we do not want to handle these manually. Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 8841a2: Fixed size of index edit dialog
by Michal Čihař 17 Jul '17

17 Jul '17

Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8841a26788e297e5734481eb3123bd7f59b570ce https://github.com/phpmyadmin/phpmyadmin/commit/8841a26788e297e5734481eb312… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M ChangeLog M js/functions.js Log Message: ----------- Fixed size of index edit dialog Fixes #13382 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 8841a2: Fixed size of index edit dialog
by Michal Čihař 17 Jul '17

17 Jul '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8841a26788e297e5734481eb3123bd7f59b570ce https://github.com/phpmyadmin/phpmyadmin/commit/8841a26788e297e5734481eb312… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M ChangeLog M js/functions.js Log Message: ----------- Fixed size of index edit dialog Fixes #13382 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 964f3d896356ad0d934b2927698dfdb71b7f79bd https://github.com/phpmyadmin/phpmyadmin/commit/964f3d896356ad0d934b2927698… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M ChangeLog M js/functions.js Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ff84a36e09db...964f3d896356

1 0

[phpmyadmin/phpmyadmin] 6a3d51: Make hex inline editor accept 0x at the begining
by Michal Čihař 17 Jul '17

17 Jul '17

Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6a3d51e084d4f37b51891ecb5d12de8a4fedb8dd https://github.com/phpmyadmin/phpmyadmin/commit/6a3d51e084d4f37b51891ecb5d1… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M js/makegrid.js M libraries/insert_edit.lib.php Log Message: ----------- Make hex inline editor accept 0x at the begining Issue #13387 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: d0ab548f7647dc7a3044f650c3de0f5119ac7930 https://github.com/phpmyadmin/phpmyadmin/commit/d0ab548f7647dc7a3044f650c3d… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M ChangeLog M libraries/insert_edit.lib.php Log Message: ----------- Fixed inline editing of hex values Fixes #13387 Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b0123cdc9fd3...d0ab548f7647

1 0

[phpmyadmin/phpmyadmin] 6a3d51: Make hex inline editor accept 0x at the begining
by Michal Čihař 17 Jul '17

17 Jul '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6a3d51e084d4f37b51891ecb5d12de8a4fedb8dd https://github.com/phpmyadmin/phpmyadmin/commit/6a3d51e084d4f37b51891ecb5d1… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M js/makegrid.js M libraries/insert_edit.lib.php Log Message: ----------- Make hex inline editor accept 0x at the begining Issue #13387 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: d0ab548f7647dc7a3044f650c3de0f5119ac7930 https://github.com/phpmyadmin/phpmyadmin/commit/d0ab548f7647dc7a3044f650c3d… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M ChangeLog M libraries/insert_edit.lib.php Log Message: ----------- Fixed inline editing of hex values Fixes #13387 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: ff84a36e09db1b7abf43276893154d7b295ae207 https://github.com/phpmyadmin/phpmyadmin/commit/ff84a36e09db1b7abf432768931… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M ChangeLog M js/makegrid.js M libraries/insert_edit.lib.php Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3755046e5e4d...ff84a36e09db

1 0

[phpmyadmin/phpmyadmin] b0123c: Translated using Weblate (Catalan)
by Michal Čihař 17 Jul '17

17 Jul '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b0123cdc9fd3203294e6acddcab5b85d11c5998c https://github.com/phpmyadmin/phpmyadmin/commit/b0123cdc9fd3203294e6acddcab… Author: Xavier Navarro <xvnavarro(a)gmail.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M po/ca.po Log Message: ----------- Translated using Weblate (Catalan) Currently translated at 100.0% (3203 of 3203 strings) [CI skip] Commit: 3755046e5e4d638577552432775c25411d185ee3 https://github.com/phpmyadmin/phpmyadmin/commit/3755046e5e4d638577552432775… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/366a8f9410c3...3755046e5e4d

1 0

[phpmyadmin/phpmyadmin] b0123c: Translated using Weblate (Catalan)
by Xavier Navarro 17 Jul '17

17 Jul '17

Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: b0123cdc9fd3203294e6acddcab5b85d11c5998c https://github.com/phpmyadmin/phpmyadmin/commit/b0123cdc9fd3203294e6acddcab… Author: Xavier Navarro <xvnavarro(a)gmail.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M po/ca.po Log Message: ----------- Translated using Weblate (Catalan) Currently translated at 100.0% (3203 of 3203 strings) [CI skip]

1 0

[phpmyadmin/phpmyadmin] 366a8f: Simplify condition for showing comment
by Michal Čihař 17 Jul '17

17 Jul '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 366a8f9410c30690699570530a667a8a99e8b831 https://github.com/phpmyadmin/phpmyadmin/commit/366a8f9410c30690699570530a6… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M templates/table/structure/display_table_stats.twig Log Message: ----------- Simplify condition for showing comment It can be unset as well. Fixes #13469 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 8b00b9: Remove last uses of PMA_MYSQL_INT_VERSION define
by Michal Čihař 17 Jul '17

17 Jul '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8b00b9037238a1320e71a0063dcc9e271fdbda2a https://github.com/phpmyadmin/phpmyadmin/commit/8b00b9037238a1320e71a0063dc… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M db_operations.php M libraries/classes/Advisor.php M libraries/classes/DatabaseInterface.php M libraries/classes/Partition.php M libraries/classes/StorageEngine.php M libraries/classes/Table.php M libraries/classes/Util.php M libraries/common.inc.php M libraries/display_change_password.lib.php M libraries/operations.lib.php M libraries/plugins/export/ExportSql.php M libraries/tbl_columns_definition_form.inc.php M templates/columns_definitions/column_comment.phtml M templates/table/structure/display_structure.phtml M test/bootstrap-dist.php M test/classes/plugin/auth/AuthenticationConfigTest.php Log Message: ----------- Remove last uses of PMA_MYSQL_INT_VERSION define It is only kept as name in Advisor for now. Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 851244: Use existing detection for showing server type
by Michal Čihař 17 Jul '17

17 Jul '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8512442a7b00059f2e26e2472334377f162f9e0c https://github.com/phpmyadmin/phpmyadmin/commit/8512442a7b00059f2e26e247233… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M libraries/classes/DatabaseInterface.php M libraries/classes/Util.php Log Message: ----------- Use existing detection for showing server type Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 0effb3012cf3931640a71850e5521a3c3f4a21f4 https://github.com/phpmyadmin/phpmyadmin/commit/0effb3012cf3931640a71850e55… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M index.php Log Message: ----------- Use new API to report version and comment Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 302a10e43b85c7ab0dbbe1386dea824f66c98d99 https://github.com/phpmyadmin/phpmyadmin/commit/302a10e43b85c7ab0dbbe1386de… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M libraries/classes/DatabaseInterface.php M test/bootstrap-dist.php M test/libraries/PMA_server_privileges_test.php Log Message: ----------- Remove no longer used PMA_MYSQL_VERSION_COMMENT define Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 91ce11809da6147f75ede5ba0ee6f57f8b1d34b4 https://github.com/phpmyadmin/phpmyadmin/commit/91ce11809da6147f75ede5ba0ee… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M libraries/classes/DatabaseInterface.php Log Message: ----------- Make fallback value consistent with what we use in tests Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 88881572becea880a6a3d6f39822f67bcd583f84 https://github.com/phpmyadmin/phpmyadmin/commit/88881572becea880a6a3d6f3982… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M libraries/classes/TypesMySQL.php Log Message: ----------- Convert Types to use new API for getting server version Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 339d42ca5df924fc7b1fa44ac0bba4907487b974 https://github.com/phpmyadmin/phpmyadmin/commit/339d42ca5df924fc7b1fa44ac0b… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M libraries/classes/DatabaseInterface.php M libraries/dbi/dbi_dummy.inc.php Log Message: ----------- Remove no longer used PMA_MARIADB define Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: e05d5f4bf4200b16d91d0df676eae6c998a48369 https://github.com/phpmyadmin/phpmyadmin/commit/e05d5f4bf4200b16d91d0df676e… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M libraries/classes/DatabaseInterface.php M libraries/classes/VersionInformation.php M libraries/plugins/export/ExportLatex.php M libraries/plugins/export/ExportSql.php M libraries/plugins/export/ExportXml.php M test/bootstrap-dist.php M test/classes/plugin/export/ExportLatexTest.php M test/classes/plugin/export/ExportSqlTest.php M test/classes/plugin/export/ExportXmlTest.php Log Message: ----------- Remove PMA_MYSQL_STR_VERSION Replace it by DatabaseInterface::getVersionString. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: e471d6b5eb7a23c3d7be4bd461a30b189754e46b https://github.com/phpmyadmin/phpmyadmin/commit/e471d6b5eb7a23c3d7be4bd461a… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php M user_password.php Log Message: ----------- Remove PMA_MYSQL_INT_VERSION from privileges code This allows us to get rid of runkit dependency on testing this. Fixes #13484 Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/89fb42f99bf3...e471d6b5eb7a

1 0