Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8f571f7e9e31743681832297973293422f8744c5 https://github.com/phpmyadmin/phpmyadmin/commit/8f571f7e9e317436818322979732... Author: William Desportes williamdes@wdes.fr Date: 2018-05-06 (Sun, 06 May 2018)
Changed paths: M libraries/classes/LanguageManager.php M test/classes/LanguageTest.php
Log Message: ----------- #14260 Fixed configuration for DefaultLang and Lang
Closes: #14260 Signed-off-by: William Desportes williamdes@wdes.fr (cherry picked from commit 2f84b4034e4c423512029534e7a6132e6f8dc4d3) Signed-off-by: Maurício Meneghini Fauth mauriciofauth@gmail.com
Commit: 4ee541a0000876e88c0facee1be12d2d4a90fe24 https://github.com/phpmyadmin/phpmyadmin/commit/4ee541a0000876e88c0facee1be1... Author: Maurício Meneghini Fauth mauriciofauth@gmail.com Date: 2018-05-06 (Sun, 06 May 2018)
Changed paths: M ChangeLog
Log Message: ----------- Add ChangeLog entry for #14260
Signed-off-by: Maurício Meneghini Fauth mauriciofauth@gmail.com
Commit: 179006a1d81be771d09baa8ecaa37937a4de6157 https://github.com/phpmyadmin/phpmyadmin/commit/179006a1d81be771d09baa8ecaa3... Author: Edward FANG fangyd1997@outlook.com Date: 2018-05-07 (Mon, 07 May 2018)
Changed paths: M po/zh_CN.po
Log Message: ----------- Translated using Weblate (Chinese (Simplified))
Currently translated at 83.9% (2761 of 3288 strings)
[CI skip]
Commit: a6814842a5bc60a65921ded49f788b6fc6a5ec5a https://github.com/phpmyadmin/phpmyadmin/commit/a6814842a5bc60a65921ded49f78... Author: Weblate noreply@weblate.org Date: 2018-05-07 (Mon, 07 May 2018)
Changed paths: M ChangeLog M libraries/classes/LanguageManager.php M test/classes/LanguageTest.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_8' into QA_4_8
Commit: 12e24ee4db6dc8f9768d03ea110381d35ddc91bc https://github.com/phpmyadmin/phpmyadmin/commit/12e24ee4db6dc8f9768d03ea1103... Author: Maurício Meneghini Fauth mauriciofauth@gmail.com Date: 2018-05-06 (Sun, 06 May 2018)
Changed paths: M ChangeLog
Log Message: ----------- Merge branch 'QA_4_8'
Signed-off-by: Maurício Meneghini Fauth mauriciofauth@gmail.com
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7df655f2c91c...12e24ee4db6d **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/
Functionality will be removed from GitHub.com on January 31st, 2019.
-
Maurício Meneghini Fauth