Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d2d3c19c701555b20e9d978fd3a31c7681d3f62f https://github.com/phpmyadmin/phpmyadmin/commit/d2d3c19c701555b20e9d978fd3a3... Author: Chien Wei Lin <cwlin0416@gmail.com> Date: 2013-12-27 (Fri, 27 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: ec89925146d0583fc1f1e9243887b8fa0b44a5e8 https://github.com/phpmyadmin/phpmyadmin/commit/ec89925146d0583fc1f1e9243887... Author: Weblate <noreply@weblate.org> Date: 2013-12-27 (Fri, 27 Dec 2013) Changed paths: M ChangeLog M libraries/display_import.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 Commit: 22bf28e9ce6a68e652c0f81b25ac96941b6708cc https://github.com/phpmyadmin/phpmyadmin/commit/22bf28e9ce6a68e652c0f81b25ac... Author: J.M <me@mynetx.net> Date: 2013-12-27 (Fri, 27 Dec 2013) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Extract PMA_getUserGroupCount helper function Signed-off-by: J.M <me@mynetx.net> Commit: 6ce9951f6c1aedba28e6d20182f0c4cc7dcdea9b https://github.com/phpmyadmin/phpmyadmin/commit/6ce9951f6c1aedba28e6d20182f0... Author: J.M <me@mynetx.net> Date: 2013-12-27 (Fri, 27 Dec 2013) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Rename local variables in PMA_getTableBodyForUserRightsTable function (no camel-case in variable names) Signed-off-by: J.M <me@mynetx.net> Commit: f16f97830a24c525b59a1b5b18d81b47fb4cb2ff https://github.com/phpmyadmin/phpmyadmin/commit/f16f97830a24c525b59a1b5b18d8... Author: J.M <me@mynetx.net> Date: 2013-12-27 (Fri, 27 Dec 2013) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Hide Edit user group link when no groups defined Signed-off-by: J.M <me@mynetx.net> Commit: 62cf9008b55c01aedea3c49a86dd625c3ffa255d https://github.com/phpmyadmin/phpmyadmin/commit/62cf9008b55c01aedea3c49a86dd... Author: J.M <me@mynetx.net> Date: 2013-12-27 (Fri, 27 Dec 2013) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Fix server privileges Action colspan (usergroups) Signed-off-by: J.M <me@mynetx.net> Commit: 02ced8271f03de2e693d69475a864b9b5af0b283 https://github.com/phpmyadmin/phpmyadmin/commit/02ced8271f03de2e693d69475a86... Author: J.M <me@mynetx.net> Date: 2013-12-27 (Fri, 27 Dec 2013) Changed paths: M ChangeLog Log Message: ----------- Add ChangeLog entry for bug #4205 Commit: 480f663bd8f66eb2417a954fcebdc175a06d992e https://github.com/phpmyadmin/phpmyadmin/commit/480f663bd8f66eb2417a954fcebd... Author: J.M <me@mynetx.net> Date: 2013-12-27 (Fri, 27 Dec 2013) Changed paths: M ChangeLog M libraries/server_privileges.lib.php Log Message: ----------- Fix #4205 Add user shows "edit user group" link Signed-off-by: J.M <me@mynetx.net> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9951278eb32f...480f663bd8f6