Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c4654d24dfb1521db507092c1bf722dc4d90449c https://github.com/phpmyadmin/phpmyadmin/commit/c4654d24dfb1521db507092c1bf7... Author: Joshua Atkins <support@jublo.net> Date: 2017-02-19 (Sun, 19 Feb 2017) Changed paths: M ChangeLog M libraries/Table.php Log Message: ----------- Copy db: Fix SQL error for copying PMADB metadata Fixes #13010. Signed-off-by: Joshua Atkins <support@jublo.net> Commit: 8a08c90cb1cdddcf237828b790bfe594f126f5d1 https://github.com/phpmyadmin/phpmyadmin/commit/8a08c90cb1cdddcf237828b790bf... Author: Michal Čihař <michal@cihar.com> Date: 2017-02-20 (Mon, 20 Feb 2017) Changed paths: M ChangeLog M composer.json M doc/faq.rst Log Message: ----------- Merge branch 'QA_4_7' into hotfix/13010-pmadb-relation-replaceinto Commit: 4591c24b45f43c08bb0209af2620dd8057b661b2 https://github.com/phpmyadmin/phpmyadmin/commit/4591c24b45f43c08bb0209af2620... Author: Michal Čihař <michal@cihar.com> Date: 2017-02-20 (Mon, 20 Feb 2017) Changed paths: M ChangeLog M libraries/Table.php Log Message: ----------- Merge pull request #13019 from jublonet/hotfix/13010-pmadb-relation-replaceinto Copy database: Fix SQL error for copying PMADB metadata Commit: 59e9856200726359298a68895dc558c03f127254 https://github.com/phpmyadmin/phpmyadmin/commit/59e9856200726359298a68895dc5... Author: Michal Čihař <michal@cihar.com> Date: 2017-02-20 (Mon, 20 Feb 2017) Changed paths: M ChangeLog M libraries/OpenDocument.php M libraries/plugins/export/ExportOds.php M libraries/plugins/export/ExportOdt.php Log Message: ----------- Fixed OpenDocument exports Fixes #13002 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: b42ef4f63102dce92746952c0af63b9dd1e74533 https://github.com/phpmyadmin/phpmyadmin/commit/b42ef4f63102dce92746952c0af6... Author: Michal Čihař <michal@cihar.com> Date: 2017-02-20 (Mon, 20 Feb 2017) Changed paths: M js/common.js Log Message: ----------- Correctly generate URL when there were not parameters Fixes #13014 Fixes #13013 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 72572cb6c2c332f19f8edb4c663d0be15dcc130f https://github.com/phpmyadmin/phpmyadmin/commit/72572cb6c2c332f19f8edb4c663d... Author: Michal Čihař <michal@cihar.com> Date: 2017-02-20 (Mon, 20 Feb 2017) Changed paths: M ChangeLog M js/common.js M libraries/OpenDocument.php M libraries/Table.php M libraries/plugins/export/ExportOds.php M libraries/plugins/export/ExportOdt.php Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c1d392deb91b...72572cb6c2c3