Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 35a3880eaba5871b0be0a4470c32b0c5bfc2bf15 https://github.com/phpmyadmin/phpmyadmin/commit/35a3880eaba5871b0be0a4470c32... Author: Chien Wei Lin cwlin0416@gmail.com Date: 2013-12-28 (Sat, 28 Dec 2013)

Changed paths: M po/zh_TW.po

Log Message: ----------- Translated using Weblate (Traditional Chinese)

Currently translated at 100.0% (2749 of 2749)

Commit: 307a273dcf6cae25ce819c85d87aee101a77ced9 https://github.com/phpmyadmin/phpmyadmin/commit/307a273dcf6cae25ce819c85d87a... Author: Weblate noreply@weblate.org Date: 2013-12-28 (Sat, 28 Dec 2013)

Changed paths: M test/libraries/PMA_server_privileges_test.php

Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1

Commit: a70e700a6bbc81ca7c3a01da4879be58503ee85a https://github.com/phpmyadmin/phpmyadmin/commit/a70e700a6bbc81ca7c3a01da4879... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2013-12-28 (Sat, 28 Dec 2013)

Changed paths: M js/ajax.js

Log Message: ----------- Few safeguards if cache history not available/expired

Signed-off-by: Atul Pratap Singh atulpratapsingh05@gmail.com

Commit: f370b425f4ee9cbb742f4055fd1dd68ed972d8ab https://github.com/phpmyadmin/phpmyadmin/commit/f370b425f4ee9cbb742f4055fd1d... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2013-12-28 (Sat, 28 Dec 2013)

Changed paths: M js/pmd/iecanvas.js M pmd_general.php

Log Message: ----------- Fix bug#4203 on refreshing designer, FullScreen is undefined

Signed-off-by: Atul Pratap Singh atulpratapsingh05@gmail.com

Commit: 7974d7d8942004bfe2fbb52132e60a07cf707307 https://github.com/phpmyadmin/phpmyadmin/commit/7974d7d8942004bfe2fbb52132e6... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2013-12-28 (Sat, 28 Dec 2013)

Changed paths: M ChangeLog

Log Message: ----------- Changelog for bug#4202 and #4203

Signed-off-by: Atul Pratap Singh atulpratapsingh05@gmail.com

Commit: 7c7b4d83eafbf52205ce708c3030e01a61ea282d https://github.com/phpmyadmin/phpmyadmin/commit/7c7b4d83eafbf52205ce708c3030... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2013-12-28 (Sat, 28 Dec 2013)

Log Message: ----------- Merge commit 'a70e700'

Commit: 96f0f448e4be0caaeb454e23e1eba69ce024a64f https://github.com/phpmyadmin/phpmyadmin/commit/96f0f448e4be0caaeb454e23e1eb... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2013-12-28 (Sat, 28 Dec 2013)

Changed paths: M ChangeLog M js/pmd/iecanvas.js M pmd_general.php

Log Message: ----------- Merge branch 'QA_4_1'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/59e89eb49e7d...96f0f448e4be