Commit Graph

93 Commits

Author SHA1 Message Date
Rouslan Placella
3ca7d34240 Destroy registered jQuery events on page tear down 2012-10-30 20:07:01 +00:00
Rouslan Placella
5838a44339 Use AJAX.registerOnload() instead of $(document).ready() 2012-10-30 20:07:01 +00:00
Rouslan Placella
61fac554d6 Got rid of inline JS on server_status.php 2012-10-30 20:04:51 +00:00
Marc Delisle
43fb11a842 Merge branch 'QA_3_5' 2012-09-25 04:11:48 -04:00
Marc Delisle
1868a29868 Fix problem with js compressor, thanks to Atul and Michal 2012-09-25 04:09:29 -04:00
Madhura Jayaratne
896d225f32 Space between if and opening parenthesis 2012-09-22 23:56:26 +05:30
Madhura Jayaratne
d1b1ad830a Inline control structures are discouraged 2012-09-22 23:54:46 +05:30
Madhura Jayaratne
57ff224d0f Remove tabs 2012-09-22 22:18:05 +05:30
Marc Delisle
9671e65dac Fix merge conflicts 2012-09-22 06:48:24 -04:00
Atul Pratap Singh
660efa1d53 Fix time formatting in tooltip 2012-09-21 12:58:14 +05:30
Marc Delisle
ab92682350 Remove Highcharts library and dead code still using it 2012-09-20 20:48:10 -04:00
Atul Pratap Singh
91330c5b31 fix for end_time less than start_time 2012-09-20 23:50:36 +05:30
Atul Pratap Singh
05fe6108c5 Add custom tooltip to monitor charts 2012-09-20 23:45:23 +05:30
Atul Pratap Singh
a45e539815 Fix time span continuation on to adjacent chart 2012-09-20 21:56:08 +05:30
Atul Pratap Singh
73b5104d6e Left in 2548043adf 2012-09-20 21:14:51 +05:30
Atul Pratap Singh
85dc955afb Merge branch 'QA_3_5-jqplot' of git://github.com/lem9/phpmyadmin into QA_3_5-jqplot 2012-09-20 01:22:47 +05:30
Atul Pratap Singh
2548043adf Fix unwanted error on mouseup 2012-09-20 01:21:31 +05:30
Marc Delisle
fc65c1fc74 Jqplot profiling chart for query analysis in Status>Monitor 2012-09-18 13:07:03 -04:00
Atul Pratap Singh
cf9fd61ce6 Fire mouseup event from chart, not from overlying div, doesn't work in IE 2012-09-17 22:16:23 +05:30
Atul Pratap Singh
89d002d38e Fix div width on leftwards drag 2012-09-17 21:59:26 +05:30
Atul Pratap Singh
e89727e531 Fix conflicts 2012-09-17 03:25:46 +05:30
Marc Delisle
423aae4c9d Send time span selection to log analysis dialog 2012-09-16 17:49:48 -04:00
Atul Pratap Singh
02cdd209be Time span selection somewhat works, not fit yet 2012-09-17 02:51:58 +05:30
Marc Delisle
50f0c4300a First attempt for time span selection, but the box is not drawn inside the chart 2012-09-16 09:41:34 -04:00
Marc Delisle
cca2aa268b Merge branch 'QA_3_5' 2012-09-11 12:42:56 -04:00
Atul Pratap Singh
0e4b828d7e jqplot: fix refresh rate under monitor tab for now 2012-09-11 12:09:25 +00:00
Atul Pratap Singh
a75181d2e1 Merge branch 'QA_3_5' 2012-09-10 07:45:06 +00:00
Atul Pratap Singh
630f2ae45d Fix monitor charts display in IE 2012-09-10 07:44:22 +00:00
Atul Pratap Singh
9aa05478d3 jqplot: make background transparent in monitor charts 2012-09-06 11:44:53 +02:00
Atul Pratap Singh
a0a48122ea jqplot: fixed y axis autoscaling 2012-09-06 11:44:28 +02:00
Atul Pratap Singh
536e71c20b jqplot: make background transparent in monitor charts 2012-09-06 00:36:00 +05:30
Atul Pratap Singh
aad601fa3f Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5 2012-09-05 23:49:39 +05:30
Atul Pratap Singh
3522da6749 jqplot: fixed y axis autoscaling 2012-09-05 23:48:50 +05:30
J.M
80911671b1 Merge branch 'QA_3_5'
Conflicts:
	server_status.php
2012-09-04 22:36:10 +02:00
J.M
2fce20d69f Add SunOS to status_monitor.js 2012-09-04 22:31:20 +02:00
Atul Pratap Singh
aef8644ca2 Merge branch 'QA_3_5' 2012-09-04 00:27:39 +05:30
Atul Pratap Singh
10ebddaf89 jqplot: y axis autoscaling enabled, jqplot's autoscale didn't seem to work 2012-09-04 00:24:05 +05:30
Atul Pratap Singh
6eadd03c80 jqplot: fix to plot multiple series 2012-09-03 22:38:52 +05:30
Atul Pratap Singh
d44714fefc Resolve conflicts while merging QA_3_5-jqplot to master 2012-08-30 23:11:24 +05:30
Atul Pratap Singh
2f88914bbd jqplot: fix settings to somewhat enable charts 2012-08-30 23:05:02 +05:30
Atul Pratap Singh
4c283ca560 jqplot: fix broken data refresh, still not displayed properly in charts 2012-08-30 01:27:15 +05:30
Atul Pratap Singh
c418319bb6 jqplot: remove highcharts settings from chart object 2012-08-29 01:20:41 +05:30
Atul Pratap Singh
4d2c49723c jqplot: add wrongly removed node parameters 2012-08-29 00:43:25 +05:30
Atul Pratap Singh
f9e197fa77 jqplot: set min, max values for x axis 2012-08-28 23:12:26 +05:30
Atul Pratap Singh
a293fef434 Remove y axis label and add title 2012-08-28 23:04:05 +05:30
Atul Pratap Singh
061b4519c9 Replace some highchart specific chart settings with jqplot ones 2012-08-28 01:37:43 +05:30
Michal Čihař
7ea30f9b6b Merge commit '0fa11e0e673b3b37a8fbfb49e1de0f6842f3838e' 2012-08-22 13:28:45 +02:00
Atul Pratap Singh
935e8fd366 Initiate porting monitor tab to jqplot 2012-08-20 08:12:01 +05:30
Rouslan Placella
971db49c11 Expect JSON for every ajax request in JavaScript 2012-06-11 14:06:05 +01:00
Jo Michael
7c1411d3e0 Fix checkstyle InlineControlStructure warnings 2012-04-29 02:36:12 +02:00