Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: be697dea2ce3100e236ff384af3416ca32550082 https://github.com/phpmyadmin/phpmyadmin/commit/be697dea2ce3100e236ff384af34... Author: Steven WdV <stevenwdv@gmail.com> Date: 2017-08-29 (Tue, 29 Aug 2017) Changed paths: M po/nl.po Log Message: ----------- Translated using Weblate (Dutch) Currently translated at 99.9% (3204 of 3205 strings) [CI skip] Commit: 9ea8fbe9c0382b4c797f434d24d7b109e92d8271 https://github.com/phpmyadmin/phpmyadmin/commit/9ea8fbe9c0382b4c797f434d24d7... Author: Weblate <noreply@weblate.org> Date: 2017-08-29 (Tue, 29 Aug 2017) Changed paths: M js/makegrid.js Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 Commit: f2cb155ed13439b3ea4f4aff88919de54962b951 https://github.com/phpmyadmin/phpmyadmin/commit/f2cb155ed13439b3ea4f4aff8891... Author: Michal Čihař <michal@cihar.com> Date: 2017-08-29 (Tue, 29 Aug 2017) Changed paths: M libraries/server_status_monitor.lib.php Log Message: ----------- Use same OS name on client and server Issue #13444 and #13628 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: e781cf0c7641aae10c2c22c26a7d9b2caa044bd9 https://github.com/phpmyadmin/phpmyadmin/commit/e781cf0c7641aae10c2c22c26a7d... Author: Michal Čihař <michal@cihar.com> Date: 2017-08-29 (Tue, 29 Aug 2017) Changed paths: M ChangeLog M js/server_status_monitor.js Log Message: ----------- Fixed javascript error in server monitor Fixes #13628 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 1af478394d3f3f004c0bbcd988b4711e3e1ff7e9 https://github.com/phpmyadmin/phpmyadmin/commit/1af478394d3f3f004c0bbcd988b4... Author: Michal Čihař <michal@cihar.com> Date: 2017-08-29 (Tue, 29 Aug 2017) Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_7' Commit: ca68951b8594bf31059529d1838902e2a755220a https://github.com/phpmyadmin/phpmyadmin/commit/ca68951b8594bf31059529d18389... Author: Michal Čihař <michal@cihar.com> Date: 2017-08-29 (Tue, 29 Aug 2017) Changed paths: M ChangeLog M js/server_status_monitor.js M libraries/server_status_monitor.lib.php Log Message: ----------- Merge branch 'QA_4_7' Commit: f8b5c256e6ba98d2bbc5ce7d2d5c4b01db9d79f5 https://github.com/phpmyadmin/phpmyadmin/commit/f8b5c256e6ba98d2bbc5ce7d2d5c... Author: Michal Čihař <michal@cihar.com> Date: 2017-08-29 (Tue, 29 Aug 2017) Changed paths: M po/nl.po Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b072b3b175c3...f8b5c256e6ba