Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d55abcd5ffa1ea8785f1217f5b7d78a8a54b8542 https://github.com/phpmyadmin/phpmyadmin/commit/d55abcd5ffa1ea8785f1217f5b7d... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2015-11-24 (Tue, 24 Nov 2015)
Changed paths: M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php M user_password.php
Log Message: ----------- Fix issue 11684
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: 67b9ab471a88d4b8ebf401be01966a8ddced19e8 https://github.com/phpmyadmin/phpmyadmin/commit/67b9ab471a88d4b8ebf401be0196... Author: Jader Teixeira jaderfeldmann@gmail.com Date: 2015-11-25 (Wed, 25 Nov 2015)
Changed paths: M po/pt_BR.po
Log Message: ----------- Translated using Weblate (Portuguese (Brazil))
Currently translated at 92.6% (2974 of 3211 strings)
[CI skip]
Commit: 060884139c3470a114c55cef1330a4f26cd52de3 https://github.com/phpmyadmin/phpmyadmin/commit/060884139c3470a114c55cef1330... Author: Weblate noreply@weblate.org Date: 2015-11-25 (Wed, 25 Nov 2015)
Changed paths: M ChangeLog M libraries/rte/rte_export.lib.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5
Commit: fa36f00198381422eb1ea61f8ccccef8a166199c https://github.com/phpmyadmin/phpmyadmin/commit/fa36f00198381422eb1ea61f8ccc... Author: Deven Bansod devenbansod@users.noreply.github.com Date: 2015-11-26 (Thu, 26 Nov 2015)
Changed paths: M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php M user_password.php
Log Message: ----------- Merge pull request #11686 from devenbansod/fix_11684
Fix issue #11684
Commit: 107f054ed6bc889ce0a771354c1d8b539311fd0f https://github.com/phpmyadmin/phpmyadmin/commit/107f054ed6bc889ce0a771354c1d... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2015-11-26 (Thu, 26 Nov 2015)
Changed paths: M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php M user_password.php
Log Message: ----------- Merge branch 'QA_4_5'
Conflicts: libraries/server_privileges.lib.php po/pt_BR.po user_password.php
Commit: e8b8d670cd06a2a3055ff8f5ed099151e16febce https://github.com/phpmyadmin/phpmyadmin/commit/e8b8d670cd06a2a3055ff8f5ed09... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2015-11-26 (Thu, 26 Nov 2015)
Changed paths: M libraries/server_privileges.lib.php
Log Message: ----------- Fix an error in merge
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0d8a4425d482...e8b8d670cd06