Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0f8ee2a630f2db90fe87f4b65c9c6715da7854a0 https://github.com/phpmyadmin/phpmyadmin/commit/0f8ee2a630f2db90fe87f4b65c9c... Author: Fujiwara Software <fujisoft@gmail.com> Date: 2017-02-13 (Mon, 13 Feb 2017) Changed paths: M po/ja.po Log Message: ----------- Translated using Weblate (Japanese) Currently translated at 71.2% (2278 of 3199 strings) [CI skip] Commit: 287e384cf2a3563075ea21b53222b62abd39ecf7 https://github.com/phpmyadmin/phpmyadmin/commit/287e384cf2a3563075ea21b53222... Author: Weblate <noreply@weblate.org> Date: 2017-02-13 (Mon, 13 Feb 2017) Changed paths: M ChangeLog M libraries/URL.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 Commit: 8f611f05cfb2d7a6f8e098aa2e8d7705f88426c6 https://github.com/phpmyadmin/phpmyadmin/commit/8f611f05cfb2d7a6f8e098aa2e8d... Author: Michal Čihař <michal@cihar.com> Date: 2017-02-13 (Mon, 13 Feb 2017) Changed paths: M ChangeLog M libraries/browse_foreigners.lib.php Log Message: ----------- Fixed rendering of foreign key browsing Fixes #12985 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 522c0598fa7106645ec4b3b448a7d3dc300ec920 https://github.com/phpmyadmin/phpmyadmin/commit/522c0598fa7106645ec4b3b448a7... Author: Michal Čihař <michal@cihar.com> Date: 2017-02-13 (Mon, 13 Feb 2017) Changed paths: M templates/table/relation/foreign_key_row.phtml Log Message: ----------- Sort column names as well Fixes #12941 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: a083a4c839987e49aac93901537b4ab5d98642f0 https://github.com/phpmyadmin/phpmyadmin/commit/a083a4c839987e49aac93901537b... Author: Michal Čihař <michal@cihar.com> Date: 2017-02-13 (Mon, 13 Feb 2017) Changed paths: M ChangeLog M libraries/gis/GISGeometry.php Log Message: ----------- Fixed manipulation with GIS data having zero coordinates Another example when using PHP's empty() leads to problems. Fixes #12957 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: bca2e1c588626298c69a2b795cec84c223fce593 https://github.com/phpmyadmin/phpmyadmin/commit/bca2e1c588626298c69a2b795cec... Author: Michal Čihař <michal@cihar.com> Date: 2017-02-13 (Mon, 13 Feb 2017) Changed paths: M ChangeLog M js/console.js M js/pmd/init.js M js/pmd/move.js M templates/database/designer/js_fields.phtml Log Message: ----------- Use standard way for getting token value in designer This way we share code with rest of phpMyAdmin, not building it again. Fixes #12804 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 274f1da99f94806293a3743e87ed108d095330bc https://github.com/phpmyadmin/phpmyadmin/commit/274f1da99f94806293a3743e87ed... Author: Michal Čihař <michal@cihar.com> Date: 2017-02-13 (Mon, 13 Feb 2017) Changed paths: M ChangeLog M js/console.js M js/pmd/init.js M js/pmd/move.js M libraries/browse_foreigners.lib.php M libraries/gis/GISGeometry.php M templates/database/designer/js_fields.phtml M templates/table/relation/foreign_key_row.phtml Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/cc68f8d14745...274f1da99f94