Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1576a1c80a4f9703036295c8438dab890f66d04e https://github.com/phpmyadmin/phpmyadmin/commit/1576a1c80a4f9703036295c8438d... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2017-05-25 (Thu, 25 May 2017) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.php Log Message: ----------- Prepare for 4.7.1 Signed-off-by: Isaac Bennetch <bennetch@gmail.com> Commit: 9471bb970d49fc6ecdcc6703cb24ea517967fcb0 https://github.com/phpmyadmin/phpmyadmin/commit/9471bb970d49fc6ecdcc6703cb24... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2017-05-26 (Fri, 26 May 2017) Changed paths: A composer.lock Log Message: ----------- Adding composer lock for 4.7.1 Signed-off-by: Isaac Bennetch <bennetch@gmail.com> Commit: a39992be43780f2a58709da56e5d41b666b8aa3b https://github.com/phpmyadmin/phpmyadmin/commit/a39992be43780f2a58709da56e5d... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2017-05-26 (Fri, 26 May 2017) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.php Log Message: ----------- Prepare for 4.7.2-dev Signed-off-by: Isaac Bennetch <bennetch@gmail.com> Commit: ace87867069fc21dbcd0bd470e931f7565e1eb70 https://github.com/phpmyadmin/phpmyadmin/commit/ace87867069fc21dbcd0bd470e93... Author: Sifat Ahmed Khan <ahmed.sifat01@gmail.com> Date: 2017-05-26 (Fri, 26 May 2017) Changed paths: M po/bn.po Log Message: ----------- Translated using Weblate (Bengali) Currently translated at 72.0% (2304 of 3198 strings) [CI skip] Commit: 9be31c355d04a380bf44587ad6d68e52d804ce43 https://github.com/phpmyadmin/phpmyadmin/commit/9be31c355d04a380bf44587ad6d6... Author: Tobby Guo <tobbyguo@gmail.com> Date: 2017-05-26 (Fri, 26 May 2017) Changed paths: M po/zh_CN.po Log Message: ----------- Translated using Weblate (Chinese (Simplified)) Currently translated at 85.9% (2750 of 3198 strings) [CI skip] Commit: dabb07f27b94173e0421c9b42a28a7b3d4bb6a6c https://github.com/phpmyadmin/phpmyadmin/commit/dabb07f27b94173e0421c9b42a28... Author: singh jashan <singhjashan151@gmail.com> Date: 2017-05-26 (Fri, 26 May 2017) Changed paths: M po/pa.po Log Message: ----------- Translated using Weblate (Punjabi) Currently translated at 2.5% (81 of 3198 strings) [CI skip] Commit: d3acc7b057c931f248d19b0fb39d274e6a63b9ab https://github.com/phpmyadmin/phpmyadmin/commit/d3acc7b057c931f248d19b0fb39d... Author: Weblate <noreply@weblate.org> Date: 2017-05-26 (Fri, 26 May 2017) Changed paths: M ChangeLog M README A composer.lock M doc/conf.py M libraries/Config.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 Commit: f06da83462fdee3762fb2e38ddd72cbaeb5dbafa https://github.com/phpmyadmin/phpmyadmin/commit/f06da83462fdee3762fb2e38ddd7... Author: Hamid Khanahmadloo <h.khanahmadloo@gmail.com> Date: 2017-05-30 (Tue, 30 May 2017) Changed paths: M po/fa.po Log Message: ----------- Translated using Weblate (Persian) Currently translated at 25.7% (823 of 3198 strings) [CI skip] Commit: b9ca93f0fc66b66417ba427444a48b12bb418fd1 https://github.com/phpmyadmin/phpmyadmin/commit/b9ca93f0fc66b66417ba427444a4... Author: Viktar Vauchkevich <victorenator@gmail.com> Date: 2017-05-30 (Tue, 30 May 2017) Changed paths: M po/be.po Log Message: ----------- Translated using Weblate (Belarusian) Currently translated at 55.3% (1770 of 3198 strings) [CI skip] Commit: d09bba5bb6b10ca90c366851e45dec2480791f5d https://github.com/phpmyadmin/phpmyadmin/commit/d09bba5bb6b10ca90c366851e45d... Author: Michal Čihař <michal@cihar.com> Date: 2017-05-31 (Wed, 31 May 2017) Changed paths: M po/pa.po Log Message: ----------- Translated using Weblate (Punjabi) Currently translated at 2.5% (81 of 3198 strings) [CI skip] Commit: b368c383570b7561bc490e848d687bb585bc8cc9 https://github.com/phpmyadmin/phpmyadmin/commit/b368c383570b7561bc490e848d68... Author: Michal Čihař <michal@cihar.com> Date: 2017-06-01 (Thu, 01 Jun 2017) Changed paths: M libraries/Util.php M libraries/config/ServerConfigChecks.php M test/classes/UtilTest.php Log Message: ----------- Move random string generation to separate method It's better to reuse the code in more locations. See #13308 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: a586c8ca4ff9f07c04eadb187a872d616be371a2 https://github.com/phpmyadmin/phpmyadmin/commit/a586c8ca4ff9f07c04eadb187a87... Author: Michal Čihař <michal@cihar.com> Date: 2017-06-01 (Thu, 01 Jun 2017) Changed paths: M test/classes/LanguageTest.php Log Message: ----------- Ensure we reset locales back to English after running tests Signed-off-by: Michal Čihař <michal@cihar.com> Commit: aa18cf7c902fbc24738adb07a7d9eac25ab1a8c6 https://github.com/phpmyadmin/phpmyadmin/commit/aa18cf7c902fbc24738adb07a7d9... Author: Michal Čihař <michal@cihar.com> Date: 2017-06-01 (Thu, 01 Jun 2017) Changed paths: R composer.lock Log Message: ----------- Remove composer lock from branch Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 82933cc68d39d4fa7ff1c3a598f39385c070eced https://github.com/phpmyadmin/phpmyadmin/commit/82933cc68d39d4fa7ff1c3a598f3... Author: Michal Čihař <michal@cihar.com> Date: 2017-06-01 (Thu, 01 Jun 2017) Changed paths: M ChangeLog A composer.lock Log Message: ----------- Merge commit 'a39992be43780f2a58709da56e5d41b666b8aa3b' Commit: a09ce3c76dbf40704e05bb214f2802ebdbe96e31 https://github.com/phpmyadmin/phpmyadmin/commit/a09ce3c76dbf40704e05bb214f28... Author: Michal Čihař <michal@cihar.com> Date: 2017-06-01 (Thu, 01 Jun 2017) Log Message: ----------- Merge commit 'd09bba5bb6b10ca90c366851e45dec2480791f5d' Commit: 3eb07713fe3b5858dee77fac74da5baf59bcdf13 https://github.com/phpmyadmin/phpmyadmin/commit/3eb07713fe3b5858dee77fac74da... Author: Michal Čihař <michal@cihar.com> Date: 2017-06-01 (Thu, 01 Jun 2017) Changed paths: R composer.lock M test/classes/LanguageTest.php Log Message: ----------- Merge branch 'QA_4_7' Commit: 71c3f9f7c16690c0cbbe194ac80291b0c58491f9 https://github.com/phpmyadmin/phpmyadmin/commit/71c3f9f7c16690c0cbbe194ac802... Author: Michal Čihař <michal@cihar.com> Date: 2017-06-01 (Thu, 01 Jun 2017) Changed paths: M libraries/Util.php Log Message: ----------- Fix check for phpseclib presence The check here was reversed compared to other locations. Fixes #13308 Signed-off-by: Michal Čihař <michal@cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6b18dfa588d0...71c3f9f7c166