Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7c2f1e1f3ad9efb66c2c6f2f76307ca019f5c9b1 https://github.com/phpmyadmin/phpmyadmin/commit/7c2f1e1f3ad9efb66c2c6f2f7630... Author: Marc Delisle marc@infomarc.info Date: 2012-07-29 (Sun, 29 Jul 2012)
Changed paths: M js/server_status.js M server_status.php
Log Message: ----------- Testing DateAxisRenderer
Commit: f9cf1d1f70401cb908f51dc1cd27dd19f1237864 https://github.com/phpmyadmin/phpmyadmin/commit/f9cf1d1f70401cb908f51dc1cd27... Author: Marc Delisle marc@infomarc.info Date: 2012-07-29 (Sun, 29 Jul 2012)
Changed paths: M js/jqplot/jquery.jqplot.js M js/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js M js/jqplot/plugins/jqplot.canvasTextRenderer.js M js/jqplot/plugins/jqplot.cursor.js M js/jqplot/plugins/jqplot.dateAxisRenderer.js M js/jqplot/plugins/jqplot.highlighter.js M js/jqplot/plugins/jqplot.pieRenderer.js
Log Message: ----------- Upgrade to jqplot 1.0.2
Commit: 8016ac497762ae47e8e9bbee16f3d5d0a426b797 https://github.com/phpmyadmin/phpmyadmin/commit/8016ac497762ae47e8e9bbee16f3... Author: Marc Delisle marc@infomarc.info Date: 2012-07-29 (Sun, 29 Jul 2012)
Changed paths: M js/server_status.js
Log Message: ----------- This works (with static data, one month interval)
Commit: 759df40f089c0ededad008ede121da4095dc2acf https://github.com/phpmyadmin/phpmyadmin/commit/759df40f089c0ededad008ede121... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-29 (Sun, 29 Jul 2012)
Changed paths: M js/jqplot/plugins/jqplot.dateAxisRenderer.js
Log Message: ----------- Tried fixing jqplot crashing problem using diff provided on https://bitbucket.org/cleonello/jqplot/issue/552/jqplot-crashes-when-interva...
Commit: 5f8c2e6fd46f1a5ce8b67fc50a70fb95127fd6a4 https://github.com/phpmyadmin/phpmyadmin/commit/5f8c2e6fd46f1a5ce8b67fc50a70... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-29 (Sun, 29 Jul 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Testing 759df40f089c0eded with static values (2 seconds intervals), it works
Commit: a415819d4d2d6d4eb12626bf1ac2a67cd4a72402 https://github.com/phpmyadmin/phpmyadmin/commit/a415819d4d2d6d4eb12626bf1ac2... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Test jqplot for updating live server query stats
Commit: c9108d7fcb7e8b17ed77014ec910a0765b3ebb2c https://github.com/phpmyadmin/phpmyadmin/commit/c9108d7fcb7e8b17ed77014ec910... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Some fixes in live query status plotting
Commit: 6fffd048019aa3bee28522b8b18261cc34aa24d9 https://github.com/phpmyadmin/phpmyadmin/commit/6fffd048019aa3bee28522b8b182... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Testing array values shifting to produce moving chart in jqplot
Commit: 0a11c56b14b79a1fc6d4d52e416674fd68a48ed4 https://github.com/phpmyadmin/phpmyadmin/commit/0a11c56b14b79a1fc6d4d52e4166... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Tested without initially populating data, now chart squeezes initially upto 10 values
Commit: 40e1582fd3020d210cb2dee143b97f80959160b6 https://github.com/phpmyadmin/phpmyadmin/commit/40e1582fd3020d210cb2dee143b9... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-03 (Fri, 03 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Make tickOptions format human readable
Commit: 69eebebfc2e596bf2fb08f8f70eee65f6a1abf5f https://github.com/phpmyadmin/phpmyadmin/commit/69eebebfc2e596bf2fb08f8f70ee... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-03 (Fri, 03 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Make y-axis at min:0
Commit: 5b18fee56773b99dae6c1186fd9d956b73314dc3 https://github.com/phpmyadmin/phpmyadmin/commit/5b18fee56773b99dae6c1186fd9d... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-04 (Sat, 04 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Re-enable setupLiveChart but there are two charts again
Commit: a113974c5cf692599cac3eb8f347c29911b7f495 https://github.com/phpmyadmin/phpmyadmin/commit/a113974c5cf692599cac3eb8f347... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-04 (Sat, 04 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Make refresh rate select work
Commit: 56c859c8069519ced7a74f55149388d7041d77e5 https://github.com/phpmyadmin/phpmyadmin/commit/56c859c8069519ced7a74f551493... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-04 (Sat, 04 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Re-enable tab switching from live to static
Commit: d9148bbc3ac71c01fe8c547786b0e30d7fabed76 https://github.com/phpmyadmin/phpmyadmin/commit/d9148bbc3ac71c01fe8c547786b0... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-04 (Sat, 04 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Now there is only one chart displayed
Commit: 78049b7f38f8ca586354ea627ca065e285bbd968 https://github.com/phpmyadmin/phpmyadmin/commit/78049b7f38f8ca586354ea627ca0... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-04 (Sat, 04 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- The chart movement is better now, with very less fluctuating x-axis/vertical lines
Commit: df2a8b1972805c6b845650c119bf9a37ee228586 https://github.com/phpmyadmin/phpmyadmin/commit/df2a8b1972805c6b845650c119bf... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-04 (Sat, 04 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Remove commented code
Commit: 309303692540faa8cdb128f972509f9b5ae26121 https://github.com/phpmyadmin/phpmyadmin/commit/309303692540faa8cdb128f97250... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-05 (Sun, 05 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Fix wrongly removed y-axis legend
Commit: 36b16c409c4c1bd9731f3eb9adc3e3dfc7773644 https://github.com/phpmyadmin/phpmyadmin/commit/36b16c409c4c1bd9731f3eb9adc3... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-07 (Tue, 07 Aug 2012)
Changed paths: M js/server_status.js M server_status.php
Log Message: ----------- Implemented Number of Data Points selector using jqplot's tickInterval
Commit: 3751474ca69eae8fda51f4c3538aa971debc9add https://github.com/phpmyadmin/phpmyadmin/commit/3751474ca69eae8fda51f4c3538a... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-07 (Tue, 07 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Do not increase ticks > 20 to prevent overlapping, though data points may increase
Commit: d6661d5c84ae06de1b080036491f1384ee4d9359 https://github.com/phpmyadmin/phpmyadmin/commit/d6661d5c84ae06de1b080036491f... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-11 (Sat, 11 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Generalize AJAX data updation for traffic/queries/processes charts
Commit: 6009af12d8bfb5e882ab75bb57757d05dd63543d https://github.com/phpmyadmin/phpmyadmin/commit/6009af12d8bfb5e882ab75bb5775... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-11 (Sat, 11 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Same function to plot/replot all live charts
Commit: 056f1fff79bfe7e384c52600677d84ee5a50970f https://github.com/phpmyadmin/phpmyadmin/commit/056f1fff79bfe7e384c52600677d... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-11 (Sat, 11 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Add is_timer_on
Commit: bf2a2c4ab373eab7a2ad6c1bcad94fe84317df7f https://github.com/phpmyadmin/phpmyadmin/commit/bf2a2c4ab373eab7a2ad6c1bcad9... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-11 (Sat, 11 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Fix typo
Commit: 873cd74263bb49506e4d150dd6a5bb97356b2cc6 https://github.com/phpmyadmin/phpmyadmin/commit/873cd74263bb49506e4d150dd6a5... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-11 (Sat, 11 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Traffic is to be displayed in KBs
Commit: 7e1164545c884df79dab7fd0eda8e401712a919c https://github.com/phpmyadmin/phpmyadmin/commit/7e1164545c884df79dab7fd0eda8... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-11 (Sat, 11 Aug 2012)
Changed paths: M js/server_status.js M server_status.php
Log Message: ----------- Plot traffic charts using jqplot
Commit: 34f34e1619b491195cba4898a7b0606bec5dc52a https://github.com/phpmyadmin/phpmyadmin/commit/34f34e1619b491195cba4898a7b0... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-11 (Sat, 11 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Fix live queries chart
Commit: 2c6d9d1c183f8ead5abf7b67d76630ad52c8ec54 https://github.com/phpmyadmin/phpmyadmin/commit/2c6d9d1c183f8ead5abf7b67d766... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-11 (Sat, 11 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Fix process chart, total processes number needs to be plotted not the difference
Commit: 9d3ec34afe2b753dc5db3431d62501803d13c5b0 https://github.com/phpmyadmin/phpmyadmin/commit/9d3ec34afe2b753dc5db3431d625... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-11 (Sat, 11 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Fix name
Commit: 109312f870ba02c9bbe99d53bdc0d83fb0863f08 https://github.com/phpmyadmin/phpmyadmin/commit/109312f870ba02c9bbe99d53bdc0... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-11 (Sat, 11 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Fix cleartimeout problem
Commit: deefd47b33c61ed61d1988df90b644543f4aba49 https://github.com/phpmyadmin/phpmyadmin/commit/deefd47b33c61ed61d1988df90b6... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-11 (Sat, 11 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Fix chart titles
Commit: cdbadbe76191f33eba89b3c6b939d08e15ecef42 https://github.com/phpmyadmin/phpmyadmin/commit/cdbadbe76191f33eba89b3c6b939... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-12 (Sun, 12 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Fix chart legends
Commit: 94d03f61302b6146656b3bd20836f9308b9ecdb7 https://github.com/phpmyadmin/phpmyadmin/commit/94d03f61302b6146656b3bd20836... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-12 (Sun, 12 Aug 2012)
Changed paths: M js/server_status.js M server_status.php
Log Message: ----------- Make default data points as 12, i.e. 2nd on the index list
Commit: 3f082551a09208f97fa0fe93ff379aecde05fe32 https://github.com/phpmyadmin/phpmyadmin/commit/3f082551a09208f97fa0fe93ff37... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Separate timeout variables for separate charts
Commit: bfd22db4a2e1ee39c10c6d7101f9b6441cfe04a7 https://github.com/phpmyadmin/phpmyadmin/commit/bfd22db4a2e1ee39c10c6d7101f9... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Separate data series for each chart
Commit: 619d4c1e1a9fb43b2080d4f51fe374400b193b28 https://github.com/phpmyadmin/phpmyadmin/commit/619d4c1e1a9fb43b2080d4f51fe3... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Use replot with chart object
Commit: b4a3f95d5877d53daa60d6cb0cda4bd77ba6602d https://github.com/phpmyadmin/phpmyadmin/commit/b4a3f95d5877d53daa60d6cb0cda... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-15 (Wed, 15 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Use selector values directly
Commit: 571aa5784992d8f9de93492755b0ae5b4b83c693 https://github.com/phpmyadmin/phpmyadmin/commit/571aa5784992d8f9de93492755b0... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-16 (Thu, 16 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Make charting smooth
Commit: 853cbb8438bcc6fc00e2f2911819e1e59cbbce60 https://github.com/phpmyadmin/phpmyadmin/commit/853cbb8438bcc6fc00e2f2911819... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-18 (Sat, 18 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Remove highcharts destroy() and use tabChart object
Commit: aef3a13b4d25bee5b145d3d4568fac7942838f57 https://github.com/phpmyadmin/phpmyadmin/commit/aef3a13b4d25bee5b145d3d4568f... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-18 (Sat, 18 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Replot charts on switching tabs
Commit: 29bd03f21a193d290a8732a64038ff88bb5de8ab https://github.com/phpmyadmin/phpmyadmin/commit/29bd03f21a193d290a8732a64038... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-18 (Sat, 18 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Fix delay on refresh rate change
Commit: 80f34aea4c4711d73b7b3b29843095ec061fad13 https://github.com/phpmyadmin/phpmyadmin/commit/80f34aea4c4711d73b7b3b298430... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-20 (Mon, 20 Aug 2012)
Changed paths: M js/jqplot/jquery.jqplot.js M js/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js M js/jqplot/plugins/jqplot.canvasTextRenderer.js M js/jqplot/plugins/jqplot.cursor.js M js/jqplot/plugins/jqplot.dateAxisRenderer.js M js/jqplot/plugins/jqplot.highlighter.js M js/jqplot/plugins/jqplot.pieRenderer.js M js/server_status.js M server_status.php
Log Message: ----------- Resolve conflicts while merging QA_3_5-jqplot
Commit: 1d8b6a15540d476aaed222e572f0ef2f0b44c4a2 https://github.com/phpmyadmin/phpmyadmin/commit/1d8b6a15540d476aaed222e572f0... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-20 (Mon, 20 Aug 2012)
Changed paths: M server_status.php
Log Message: ----------- Fix refresh rate selector class
Commit: 56cfb01de0d2d2612203c700f48ab37776b3b3f9 https://github.com/phpmyadmin/phpmyadmin/commit/56cfb01de0d2d2612203c700f48a... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-20 (Mon, 20 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Fix pie chart as per jqplot
Commit: 4b6f4ebfe3cd2ee624e704a1bc492302b391b1f6 https://github.com/phpmyadmin/phpmyadmin/commit/4b6f4ebfe3cd2ee624e704a1bc49... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-21 (Tue, 21 Aug 2012)
Changed paths: M js/server_status.js
Log Message: ----------- Fix jqplot charts response data
Commit: 0878dbf502889c05f8612736718b23637e33f424 https://github.com/phpmyadmin/phpmyadmin/commit/0878dbf502889c05f8612736718b... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-08-21 (Tue, 21 Aug 2012)
Changed paths: M libraries/structure.lib.php A test/libraries/PMA_operations_test.php
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: a9342b822e79ffae1fb440f05a6886f4cb182828 https://github.com/phpmyadmin/phpmyadmin/commit/a9342b822e79ffae1fb440f05a68... Author: Marc Delisle marc@infomarc.info Date: 2012-08-22 (Wed, 22 Aug 2012)
Changed paths: M js/jqplot/jquery.jqplot.js M js/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js M js/jqplot/plugins/jqplot.canvasTextRenderer.js M js/jqplot/plugins/jqplot.cursor.js M js/jqplot/plugins/jqplot.dateAxisRenderer.js M js/jqplot/plugins/jqplot.highlighter.js M js/jqplot/plugins/jqplot.pieRenderer.js M js/server_status.js M server_status.php
Log Message: ----------- Merge branch 'atul-master'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f4ce124fa0b8...a9342b822e79
-
Marc Delisle