Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0e4b828d7e193108f54e86d6cead3f79303b14ec https://github.com/phpmyadmin/phpmyadmin/commit/0e4b828d7e193108f54e86d6cead... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-09-11 (Tue, 11 Sep 2012)

Changed paths: M js/server_status_monitor.js

Log Message: ----------- jqplot: fix refresh rate under monitor tab for now

Commit: 095083369a5508a92e4a78912e7619f3a815c4c4 https://github.com/phpmyadmin/phpmyadmin/commit/095083369a5508a92e4a78912e76... Author: Marc Delisle marc@infomarc.info Date: 2012-09-11 (Tue, 11 Sep 2012)

Changed paths: M js/server_status.js

Log Message: ----------- Remove call to old Highcharts code

Commit: cca2aa268bb286e4cda42a37229ad2a03de7fb1c https://github.com/phpmyadmin/phpmyadmin/commit/cca2aa268bb286e4cda42a37229a... Author: Marc Delisle marc@infomarc.info Date: 2012-09-11 (Tue, 11 Sep 2012)

Changed paths: M js/server_status.js M js/server_status_monitor.js

Log Message: ----------- Merge branch 'QA_3_5'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5a187f6252f7...cca2aa268bb2