Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7ae3259b6406628c941fc23844256d8d938a261d https://github.com/phpmyadmin/phpmyadmin/commit/7ae3259b6406628c941fc2384425... Author: Laura Arjona Reina <larjona@larjona.net> Date: 2016-12-13 (Tue, 13 Dec 2016) Changed paths: M po/es.po Log Message: ----------- Translated using Weblate (Spanish) Currently translated at 99.7% (3215 of 3222 strings) [CI skip] Commit: 685b51d5d517fa69297617c18e0cb4c7caeb9482 https://github.com/phpmyadmin/phpmyadmin/commit/685b51d5d517fa69297617c18e0c... Author: jorge jansen abreu <condecalifornia@hotmail.com> Date: 2016-12-13 (Tue, 13 Dec 2016) Changed paths: M po/es.po Log Message: ----------- Translated using Weblate (Spanish) Currently translated at 99.8% (3216 of 3222 strings) [CI skip] Commit: 90e4325bcf57d2a7d4f8ae9b1ac96d370a4c7c97 https://github.com/phpmyadmin/phpmyadmin/commit/90e4325bcf57d2a7d4f8ae9b1ac9... Author: Michal Čihař <michal@cihar.com> Date: 2016-12-13 (Tue, 13 Dec 2016) Changed paths: M setup/frames/index.inc.php M setup/lib/index.lib.php M setup/scripts.js Log Message: ----------- Rewrite https in setup and messages handling - The client side check is more reliable - Does not depend on server setup - Removed related inline javascript (see #12261) Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 4fc04f39384d52a2b4894cfaff572e9a76927c62 https://github.com/phpmyadmin/phpmyadmin/commit/4fc04f39384d52a2b4894cfaff57... Author: Michal Čihař <michal@cihar.com> Date: 2016-12-13 (Tue, 13 Dec 2016) Changed paths: M test/libraries/PMA_SetupIndex_test.php Log Message: ----------- Adjust tests to new setup handling of messages Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 35a838697e048198faed012efb169ba6b4735ac9 https://github.com/phpmyadmin/phpmyadmin/commit/35a838697e048198faed012efb16... Author: Michal Čihař <michal@cihar.com> Date: 2016-12-13 (Tue, 13 Dec 2016) Log Message: ----------- Merge commit '685b51d5d517fa69297617c18e0cb4c7caeb9482' Commit: 49a20101e2244832797f59c9d76139b94f881014 https://github.com/phpmyadmin/phpmyadmin/commit/49a20101e2244832797f59c9d761... Author: Michal Čihař <michal@cihar.com> Date: 2016-12-13 (Tue, 13 Dec 2016) Changed paths: M setup/frames/index.inc.php M setup/lib/index.lib.php M setup/scripts.js M test/libraries/PMA_SetupIndex_test.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/583f5ff533d3...49a20101e224