Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b12411cc2466639e7684c8414e65e19b8d170cc7 https://github.com/phpmyadmin/phpmyadmin/commit/b12411cc2466639e7684c8414e65... Author: Pavel Rochnyack pavel2000@ngs.ru Date: 2016-08-03 (Wed, 03 Aug 2016)
Changed paths: M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php
Log Message: ----------- Fix header in User Properties editor
Signed-off-by: Pavel Rochnyack pavel2000@ngs.ru
Commit: ebb2ab12ce76ae91819ecdea9b111fea17494655 https://github.com/phpmyadmin/phpmyadmin/commit/ebb2ab12ce76ae91819ecdea9b11... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-09-12 (Mon, 12 Sep 2016)
Changed paths: M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php
Log Message: ----------- Merge branch 'fix-HtmlHeaderForUserProperties' of https://github.com/rpv-tomsk/phpmyadmin into rpv-tomsk-fix-HtmlHeaderForUserProperties
Commit: b83b71d5a555857299b50a097155307028915941 https://github.com/phpmyadmin/phpmyadmin/commit/b83b71d5a555857299b50a097155... Author: Burak Yavuz hitowerdigit@hotmail.com Date: 2016-11-10 (Thu, 10 Nov 2016)
Changed paths: M po/tr.po
Log Message: ----------- Translated using Weblate (Turkish)
Currently translated at 100.0% (3222 of 3222 strings)
[CI skip]
Commit: 35c7c8039fbfc5680584f01f596d5ea47294369c https://github.com/phpmyadmin/phpmyadmin/commit/35c7c8039fbfc5680584f01f596d... Author: Παναγιώτης Παπάζογλου papaz_p@yahoo.com Date: 2016-11-10 (Thu, 10 Nov 2016)
Changed paths: M po/el.po
Log Message: ----------- Translated using Weblate (Greek)
Currently translated at 100.0% (3222 of 3222 strings)
[CI skip]
Commit: f7c8cd72a2611745f0bb3f44cced234c3c8414e8 https://github.com/phpmyadmin/phpmyadmin/commit/f7c8cd72a2611745f0bb3f44cced... Author: dingo thirteen dingo13@gmail.com Date: 2016-11-10 (Thu, 10 Nov 2016)
Changed paths: M po/nl.po
Log Message: ----------- Translated using Weblate (Dutch)
Currently translated at 100.0% (3222 of 3222 strings)
[CI skip]
Commit: f80140c46e7e3df31dd5450b60136518b8ac1f0a https://github.com/phpmyadmin/phpmyadmin/commit/f80140c46e7e3df31dd5450b6013... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-11 (Fri, 11 Nov 2016)
Changed paths: M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php
Log Message: ----------- Fix function parameters in b12411cc2466639e7684c8414e65e19b8d170cc7
Fix #12542
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: d4377e40d8a9a541b1508b4065c80c69ed62b346 https://github.com/phpmyadmin/phpmyadmin/commit/d4377e40d8a9a541b1508b4065c8... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-11 (Fri, 11 Nov 2016)
Changed paths: M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php
Log Message: ----------- Merge branch 'rpv-tomsk-fix-HtmlHeaderForUserProperties' into QA_4_6
Commit: d580bb3b51543b626eacc29f862364683ba5c779 https://github.com/phpmyadmin/phpmyadmin/commit/d580bb3b51543b626eacc29f8623... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-11 (Fri, 11 Nov 2016)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog for #12542
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: 560bd2ba89aad559ca7b61974788f131bb01acdc https://github.com/phpmyadmin/phpmyadmin/commit/560bd2ba89aad559ca7b61974788... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-11 (Fri, 11 Nov 2016)
Changed paths: M ChangeLog M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php
Log Message: ----------- Merge branch 'QA_4_6'
Conflicts: po/el.po po/nl.po po/tr.po
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/12d0879fae93...560bd2ba89aa