Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6f81207d84b4b125d34bb882a6735913ccd0a62c https://github.com/phpmyadmin/phpmyadmin/commit/6f81207d84b4b125d34bb882a673... Author: Juha jremes@outlook.com Date: 2015-10-13 (Tue, 13 Oct 2015)
Changed paths: M po/fi.po
Log Message: ----------- Translated using Weblate (Finnish)
Currently translated at 60.6% (1946 of 3210 strings)
[CI skip]
Commit: d097ed33bf51455d4b6d452f788ee1c8c1a6bb41 https://github.com/phpmyadmin/phpmyadmin/commit/d097ed33bf51455d4b6d452f788e... Author: Weblate noreply@weblate.org Date: 2015-10-13 (Tue, 13 Oct 2015)
Changed paths: M libraries/export.lib.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5
Commit: 17c4bb184cd1e602a851beda204705fd17071351 https://github.com/phpmyadmin/phpmyadmin/commit/17c4bb184cd1e602a851beda2047... Author: Marc Delisle marc@infomarc.info Date: 2015-10-13 (Tue, 13 Oct 2015)
Changed paths: M js/functions.js M libraries/display_change_password.lib.php M libraries/server_privileges.lib.php M user_password.php
Log Message: ----------- Merge pull request #11569 from devenbansod/refactor_auth_plugins
Refactor code for generation available auth plugins HTML
Commit: b884ccd7537032782359e0bb5fceae969b16c307 https://github.com/phpmyadmin/phpmyadmin/commit/b884ccd7537032782359e0bb5fce... Author: Marc Delisle marc@infomarc.info Date: 2015-10-13 (Tue, 13 Oct 2015)
Changed paths: M libraries/server_privileges.lib.php
Log Message: ----------- Enable translation of auth plugin description
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 10b38a4aec06e63876dd30c4a4b8a8f48720636e https://github.com/phpmyadmin/phpmyadmin/commit/10b38a4aec06e63876dd30c4a4b8... Author: Juha jremes@outlook.com Date: 2015-10-13 (Tue, 13 Oct 2015)
Changed paths: M po/fi.po
Log Message: ----------- Translated using Weblate (Finnish)
Currently translated at 60.8% (1954 of 3210 strings)
[CI skip]
Commit: 649591da8dd93f1ec386013f4cf40469bc08897f https://github.com/phpmyadmin/phpmyadmin/commit/649591da8dd93f1ec386013f4cf4... Author: Weblate noreply@weblate.org Date: 2015-10-13 (Tue, 13 Oct 2015)
Changed paths: M libraries/server_privileges.lib.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5
Commit: b2de929be4425ee983eac9aacea7ee7edb7a1122 https://github.com/phpmyadmin/phpmyadmin/commit/b2de929be4425ee983eac9aacea7... Author: Marc Delisle marc@infomarc.info Date: 2015-10-13 (Tue, 13 Oct 2015)
Log Message: ----------- Merge commit 'd097ed3'
Commit: 8a82a04ff95045b6c9e7a2ac387a16c32cd657de https://github.com/phpmyadmin/phpmyadmin/commit/8a82a04ff95045b6c9e7a2ac387a... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2015-10-14 (Wed, 14 Oct 2015)
Changed paths: M js/functions.js M libraries/display_change_password.lib.php M libraries/server_privileges.lib.php M user_password.php
Log Message: ----------- Refactor code for generation of available auth plugins HTML
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: 7ddbfefb9d7cd21c96c8cbe8d2282e8f2bb474bf https://github.com/phpmyadmin/phpmyadmin/commit/7ddbfefb9d7cd21c96c8cbe8d228... Author: Marc Delisle marc@infomarc.info Date: 2015-10-13 (Tue, 13 Oct 2015)
Changed paths: M js/functions.js M libraries/display_change_password.lib.php M libraries/server_privileges.lib.php M user_password.php
Log Message: ----------- Fix merge conflicts
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: c01a276ea15e202ae701a869141cf99e20d7fcef https://github.com/phpmyadmin/phpmyadmin/commit/c01a276ea15e202ae701a869141c... Author: Marc Delisle marc@infomarc.info Date: 2015-10-13 (Tue, 13 Oct 2015)
Log Message: ----------- Merge commit '17c4bb1'
Commit: b07ba3c831f85d0946af6c19c6faff5719450d81 https://github.com/phpmyadmin/phpmyadmin/commit/b07ba3c831f85d0946af6c19c6fa... Author: Marc Delisle marc@infomarc.info Date: 2015-10-13 (Tue, 13 Oct 2015)
Changed paths: M libraries/server_privileges.lib.php
Log Message: ----------- Merge commit 'b884ccd'
Commit: 4fe4cfa46a544100066764237e8c9f7a911ee8ce https://github.com/phpmyadmin/phpmyadmin/commit/4fe4cfa46a544100066764237e8c... Author: Marc Delisle marc@infomarc.info Date: 2015-10-13 (Tue, 13 Oct 2015)
Log Message: ----------- Merge commit '649591d'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b88f03c7189e...4fe4cfa46a54
-
Marc Delisle