Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 28a5a2693bb6bd079c1feddd3d0c4b5753156d44 https://github.com/phpmyadmin/phpmyadmin/commit/28a5a2693bb6bd079c1feddd3d0c... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2015-12-26 (Sat, 26 Dec 2015) Changed paths: M libraries/Table.class.php M libraries/mysql_charsets.lib.php M test/classes/PMA_Table_test.php Log Message: ----------- Fix error in commit : a4f02ca Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: 74d27e4fe13573927549f99eff90b0bd28673688 https://github.com/phpmyadmin/phpmyadmin/commit/74d27e4fe13573927549f99eff90... Author: Thành Phạm <tienthanh.dqc@gmail.com> Date: 2015-12-26 (Sat, 26 Dec 2015) Changed paths: M po/vi.po Log Message: ----------- Translated using Weblate (Vietnamese) Currently translated at 2.3% (76 of 3210 strings) [CI skip] Commit: f7f33886534a13293c48c2333b5b1ffa855995fb https://github.com/phpmyadmin/phpmyadmin/commit/f7f33886534a13293c48c2333b5b... Author: Weblate <noreply@weblate.org> Date: 2015-12-26 (Sat, 26 Dec 2015) Changed paths: M ChangeLog M libraries/SavedSearches.class.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 Commit: 8bd97563b48f26cf556e19f6bfafea1f10ecbec7 https://github.com/phpmyadmin/phpmyadmin/commit/8bd97563b48f26cf556e19f6bfaf... Author: Deven Bansod <devenbansod@users.noreply.github.com> Date: 2015-12-27 (Sun, 27 Dec 2015) Changed paths: M libraries/Table.class.php M libraries/mysql_charsets.lib.php M test/classes/PMA_Table_test.php Log Message: ----------- Merge pull request #11779 from devenbansod/fix_error_in_11757_correction Fix #11777: While 'changing a column', query fails with a syntax error after the 'CHARSET=' keyword Commit: 32c6726d6888e7e1646e74910ee68d9260f14624 https://github.com/phpmyadmin/phpmyadmin/commit/32c6726d6888e7e1646e74910ee6... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2015-12-27 (Sun, 27 Dec 2015) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for issue #11777 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: 56e3c123a008e7bbca2ff27cb4cabb3da8f33bb3 https://github.com/phpmyadmin/phpmyadmin/commit/56e3c123a008e7bbca2ff27cb4ca... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2015-12-27 (Sun, 27 Dec 2015) Changed paths: M ChangeLog M libraries/Table.php M libraries/mysql_charsets.lib.php M test/classes/TableTest.php Log Message: ----------- Merge branch 'QA_4_5' Conflicts: libraries/mysql_charsets.lib.php po/vi.po test/classes/TableTest.php Compare: https://github.com/phpmyadmin/phpmyadmin/compare/043f34b51bc3...56e3c123a008