Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b9314f1d80ccdc873e0b06cf7ab632f82e78dcdf https://github.com/phpmyadmin/phpmyadmin/commit/b9314f1d80ccdc873e0b06cf7ab6... Author: yagoub fadel yagoub76@gmail.com Date: 2017-07-08 (Sat, 08 Jul 2017)
Changed paths: M po/ar.po
Log Message: ----------- Translated using Weblate (Arabic)
Currently translated at 49.3% (1581 of 3203 strings)
[CI skip]
Commit: 57fc8e8cf7421919a364eb90282266b62d4c42b3 https://github.com/phpmyadmin/phpmyadmin/commit/57fc8e8cf7421919a364eb902822... Author: zhangmiao myzhm@163.com Date: 2017-07-08 (Sat, 08 Jul 2017)
Changed paths: M po/zh_CN.po
Log Message: ----------- Translated using Weblate (Chinese (Simplified))
Currently translated at 85.8% (2751 of 3203 strings)
[CI skip]
Commit: 67b0180ba9bb6263663491b1b0e820360cd3206f https://github.com/phpmyadmin/phpmyadmin/commit/67b0180ba9bb6263663491b1b0e8... Author: Weblate noreply@weblate.org Date: 2017-07-08 (Sat, 08 Jul 2017)
Changed paths: M ChangeLog M libraries/Util.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7
Commit: a4ec378179f33a98e9d07e21e36cb1523e10094c https://github.com/phpmyadmin/phpmyadmin/commit/a4ec378179f33a98e9d07e21e36c... Author: Michal Čihař michal@cihar.com Date: 2017-07-09 (Sun, 09 Jul 2017)
Changed paths: M ChangeLog M libraries/Util.php M test/classes/DisplayResultsTest.php
Log Message: ----------- Move spacing around buttons to Util::getMessage
We really do not want to add spacing around all buttons, just the ones in the SQL message.
Fixes #13445
Signed-off-by: Michal Čihař michal@cihar.com
Commit: d4268d20ac5ad0ba4f47992dcd683d384d8b8a5a https://github.com/phpmyadmin/phpmyadmin/commit/d4268d20ac5ad0ba4f47992dcd68... Author: Michal Čihař michal@cihar.com Date: 2017-07-09 (Sun, 09 Jul 2017)
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_7'
Commit: f563880af4dac357dd48b4ea4ff8dca48255551d https://github.com/phpmyadmin/phpmyadmin/commit/f563880af4dac357dd48b4ea4ff8... Author: Michal Čihař michal@cihar.com Date: 2017-07-09 (Sun, 09 Jul 2017)
Changed paths: M ChangeLog M libraries/classes/Util.php M test/classes/DisplayResultsTest.php
Log Message: ----------- Merge branch 'QA_4_7'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b2ad33ca474b...f563880af4da
-
Michal Čihař