Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: dcdeee28eb6a251ad2fcb70d81fe55f1569b4580 https://github.com/phpmyadmin/phpmyadmin/commit/dcdeee28eb6a251ad2fcb70d81fe... Author: Michal Čihař <michal@cihar.com> Date: 2016-01-19 (Tue, 19 Jan 2016) Changed paths: M ChangeLog M js/server_status_monitor.js M js/server_status_variables.js M js/server_variables.js Log Message: ----------- Gracefully handle errors in regex based javascript search User can write any invalid regex and we should handle this gracefully. Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 32c7a540769e4668e4887e709abaa5aa67acc277 https://github.com/phpmyadmin/phpmyadmin/commit/32c7a540769e4668e4887e709aba... Author: Michal Čihař <michal@cihar.com> Date: 2016-01-19 (Tue, 19 Jan 2016) Changed paths: M ChangeLog M js/server_status_monitor.js M js/server_status_variables.js M js/server_variables.js Log Message: ----------- Merge branch 'MAINT_4_5_4' into QA_4_5 Commit: 8e99da9685ee728b39d8e998c61b15e1df17659a https://github.com/phpmyadmin/phpmyadmin/commit/8e99da9685ee728b39d8e998c61b... Author: Michal Čihař <michal@cihar.com> Date: 2016-01-19 (Tue, 19 Jan 2016) Changed paths: M ChangeLog M js/server_status_monitor.js M js/server_status_variables.js M js/server_variables.js Log Message: ----------- Merge branch 'QA_4_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9947f17c3c99...8e99da9685ee