Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: eae555520cdc517d1913fe37919b8d7053cbf29f https://github.com/phpmyadmin/phpmyadmin/commit/eae555520cdc517d1913fe37919b... Author: Marc Delisle marc@infomarc.info Date: 2012-09-16 (Sun, 16 Sep 2012)

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

Log Message: ----------- temporarily change loading mechanism, to enable Firebug tracing

Commit: 50f0c4300a33b1d60d8efcbf6f1a77c0a633ca2e https://github.com/phpmyadmin/phpmyadmin/commit/50f0c4300a33b1d60d8efcbf6f1a... Author: Marc Delisle marc@infomarc.info Date: 2012-09-16 (Sun, 16 Sep 2012)

Changed paths: M js/server_status_monitor.js

Log Message: ----------- First attempt for time span selection, but the box is not drawn inside the chart

Commit: 5957570bf54043ef0b2c0281550959ca10a02937 https://github.com/phpmyadmin/phpmyadmin/commit/5957570bf54043ef0b2c02815509... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-09-16 (Sun, 16 Sep 2012)

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

Log Message: ----------- Re-enable javascript loading for monitor tab

Commit: 02cdd209beb75bce3d1aafcb70fd284362aba2b1 https://github.com/phpmyadmin/phpmyadmin/commit/02cdd209beb75bce3d1aafcb70fd... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-09-16 (Sun, 16 Sep 2012)

Changed paths: M js/server_status_monitor.js

Log Message: ----------- Time span selection somewhat works, not fit yet

Commit: 423aae4c9d02a9d0fe545937e3b728ac5e7c6c36 https://github.com/phpmyadmin/phpmyadmin/commit/423aae4c9d02a9d0fe545937e3b7... Author: Marc Delisle marc@infomarc.info Date: 2012-09-16 (Sun, 16 Sep 2012)

Changed paths: M js/server_status_monitor.js

Log Message: ----------- Send time span selection to log analysis dialog

Commit: e89727e5311e81d42d860b688a58fc340f691261 https://github.com/phpmyadmin/phpmyadmin/commit/e89727e5311e81d42d860b688a58... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-09-16 (Sun, 16 Sep 2012)

Changed paths: M js/server_status_monitor.js

Log Message: ----------- Fix conflicts

Commit: 89d002d38ee71c1b0e5c561d4e3b141663434c3e https://github.com/phpmyadmin/phpmyadmin/commit/89d002d38ee71c1b0e5c561d4e3b... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-09-17 (Mon, 17 Sep 2012)

Changed paths: M js/server_status_monitor.js

Log Message: ----------- Fix div width on leftwards drag

Commit: cf9fd61ce64f191863b3d9b521d376fd45a23ff4 https://github.com/phpmyadmin/phpmyadmin/commit/cf9fd61ce64f191863b3d9b521d3... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-09-17 (Mon, 17 Sep 2012)

Changed paths: M js/server_status_monitor.js

Log Message: ----------- Fire mouseup event from chart, not from overlying div, doesn't work in IE

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

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

Log Message: ----------- Jqplot profiling chart for query analysis in Status>Monitor

Commit: 2548043adf32b8c8add18079c61b4ba1c47109e9 https://github.com/phpmyadmin/phpmyadmin/commit/2548043adf32b8c8add18079c61b... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-09-19 (Wed, 19 Sep 2012)

Changed paths: M js/server_status_monitor.js

Log Message: ----------- Fix unwanted error on mouseup

Commit: 85dc955afbeff45e0e81625fd3b017dfccc383bf https://github.com/phpmyadmin/phpmyadmin/commit/85dc955afbeff45e0e81625fd3b0... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-09-19 (Wed, 19 Sep 2012)

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

Log Message: ----------- Merge branch 'QA_3_5-jqplot' of git://github.com/lem9/phpmyadmin into QA_3_5-jqplot

Commit: 73b5104d6ea6c7db846fce786c548ad0730484c3 https://github.com/phpmyadmin/phpmyadmin/commit/73b5104d6ea6c7db846fce786c54... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-09-20 (Thu, 20 Sep 2012)

Changed paths: M js/server_status_monitor.js

Log Message: ----------- Left in 2548043adf32b8c8add18079

Commit: a45e5398157f2d3c82864bdd9a095dd370fa14e3 https://github.com/phpmyadmin/phpmyadmin/commit/a45e5398157f2d3c82864bdd9a09... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-09-20 (Thu, 20 Sep 2012)

Changed paths: M js/server_status_monitor.js

Log Message: ----------- Fix time span continuation on to adjacent chart

Commit: 05fe6108c51616cff7b784bff10f07d3b7549db9 https://github.com/phpmyadmin/phpmyadmin/commit/05fe6108c51616cff7b784bff10f... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-09-20 (Thu, 20 Sep 2012)

Changed paths: M js/server_status_monitor.js

Log Message: ----------- Add custom tooltip to monitor charts

Commit: 91330c5b31b4b0d495dd693d124979b9c3b21cfd https://github.com/phpmyadmin/phpmyadmin/commit/91330c5b31b4b0d495dd693d1249... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-09-20 (Thu, 20 Sep 2012)

Changed paths: M js/server_status_monitor.js

Log Message: ----------- fix for end_time less than start_time

Commit: ab92682350c4f92e9035c03cc62c7d4cc7026b28 https://github.com/phpmyadmin/phpmyadmin/commit/ab92682350c4f92e9035c03cc62c... Author: Marc Delisle marc@infomarc.info Date: 2012-09-20 (Thu, 20 Sep 2012)

Changed paths: M build.xml M js/functions.js R js/highcharts/exporting.js R js/highcharts/highcharts.js M js/server_status.js M js/server_status_monitor.js M server_status.php

Log Message: ----------- Remove Highcharts library and dead code still using it

Commit: 660efa1d53507452a4862bea48738a88af5f353f https://github.com/phpmyadmin/phpmyadmin/commit/660efa1d53507452a4862bea4873... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-09-21 (Fri, 21 Sep 2012)

Changed paths: M js/server_status_monitor.js

Log Message: ----------- Fix time formatting in tooltip

Commit: 787a0aa573444299b97700e3c302b8cdf4ec271e https://github.com/phpmyadmin/phpmyadmin/commit/787a0aa573444299b97700e3c302... Author: Marc Delisle marc@infomarc.info Date: 2012-09-21 (Fri, 21 Sep 2012)

Changed paths: M build.xml M js/functions.js R js/highcharts/exporting.js R js/highcharts/highcharts.js M js/server_status.js M js/server_status_monitor.js M server_status.php

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

Commit: 9671e65dac58f41ac64dd49f7cc02cd4db1ed7f2 https://github.com/phpmyadmin/phpmyadmin/commit/9671e65dac58f41ac64dd49f7cc0... Author: Marc Delisle marc@infomarc.info Date: 2012-09-22 (Sat, 22 Sep 2012)

Changed paths: M build.xml M js/functions.js R js/highcharts/exporting.js R js/highcharts/highcharts.js M js/server_status.js M js/server_status_monitor.js M server_status.php

Log Message: ----------- Fix merge conflicts

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6f187886fb52...9671e65dac58