Marc Delisle
|
9671e65dac
|
Fix merge conflicts
|
2012-09-22 06:48:24 -04:00 |
|
Marc Delisle
|
ab92682350
|
Remove Highcharts library and dead code still using it
|
2012-09-20 20:48:10 -04:00 |
|
Michal Čihař
|
83f25cc0e1
|
Drop some inline html
|
2012-09-19 13:47:20 +02:00 |
|
Michal Čihař
|
c64707ea79
|
Docblocks improvements
|
2012-09-19 13:47:20 +02:00 |
|
Atul Pratap Singh
|
5957570bf5
|
Re-enable javascript loading for monitor tab
|
2012-09-17 02:46:36 +05:30 |
|
Marc Delisle
|
eae555520c
|
temporarily change loading mechanism, to enable Firebug tracing
|
2012-09-16 08:28:29 -04:00 |
|
Chanaka Indrajith
|
e6894be57f
|
Renamed ->method() with PMA_Util::method()
|
2012-09-16 14:35:45 +05:30 |
|
Chanaka Indrajith
|
0829709064
|
Remove variable
|
2012-09-16 14:31:22 +05:30 |
|
Dieter Adriaenssens
|
9a5b12f42e
|
various coding style improvements
|
2012-09-07 17:36:12 +02:00 |
|
Michal Čihař
|
e9ba7339a7
|
Coding style improvements
|
2012-09-05 07:11:18 +02:00 |
|
Michal Čihař
|
0791b6b5ae
|
Fix unresolved merge conflict
|
2012-09-05 07:10:50 +02:00 |
|
J.M
|
80911671b1
|
Merge branch 'QA_3_5'
Conflicts:
server_status.php
|
2012-09-04 22:36:10 +02:00 |
|
J.M
|
bf5f51bee2
|
add support for Solaris and FreeBSD system load and memory display in server status
|
2012-09-04 22:15:32 +02:00 |
|
Madhura Jayaratne
|
8ce541068c
|
Various coding style changes
|
2012-08-31 14:37:46 +05:30 |
|
Madhura Jayaratne
|
12fbba3724
|
Inline control structures are discouraged
|
2012-08-30 22:19:00 +05:30 |
|
Madhura Jayaratne
|
226c3d5186
|
Trailing white space cleanup
|
2012-08-30 22:17:55 +05:30 |
|
Marc Delisle
|
d7145f4783
|
Remove unnecessary caps
|
2012-08-22 13:30:40 +02:00 |
|
Marc Delisle
|
11102c07f0
|
Remove unnecessary caps
|
2012-08-22 06:31:47 -04:00 |
|
Atul Pratap Singh
|
1d8b6a1554
|
Fix refresh rate selector class
|
2012-08-20 23:54:32 +05:30 |
|
Atul Pratap Singh
|
80f34aea4c
|
Resolve conflicts while merging QA_3_5-jqplot
|
2012-08-20 23:50:56 +05:30 |
|
Atul Pratap Singh
|
94d03f6130
|
Make default data points as 12, i.e. 2nd on the index list
|
2012-08-12 19:49:27 +05:30 |
|
Chanaka Indrajith
|
62ea33921d
|
Sortable ability for server processlist
|
2012-08-11 23:35:45 +05:30 |
|
Atul Pratap Singh
|
7e1164545c
|
Plot traffic charts using jqplot
|
2012-08-11 18:29:37 +05:30 |
|
Atul Pratap Singh
|
36b16c409c
|
Implemented Number of Data Points selector using jqplot's tickInterval
|
2012-08-07 23:42:43 +05:30 |
|
Marc Delisle
|
7c2f1e1f3a
|
Testing DateAxisRenderer
|
2012-07-29 06:23:55 -04:00 |
|
Chanaka Indrajith
|
106265a7f8
|
Resolve conflicts
|
2012-06-30 11:30:39 +05:30 |
|
Chanaka Indrajith
|
1cc49d32d9
|
Resolved conflicts
|
2012-06-27 07:06:34 +05:30 |
|
Chanaka Indrajith
|
766466135e
|
Implement class behavior of common.lib.php file
|
2012-06-22 23:38:33 +05:30 |
|
Michal Čihař
|
64b19b0181
|
Wrap some long lines
|
2012-06-21 13:27:19 +02:00 |
|
Michal Čihař
|
82fc0ff49f
|
Some indenation fixes
|
2012-06-21 13:27:19 +02:00 |
|
Rouslan Placella
|
dc8f882919
|
Set headerIsSent property of PMA_Header class as private,
as it's no longer necessary to access it externally
|
2012-06-12 14:21:48 +01:00 |
|
Rouslan Placella
|
eb98110541
|
Dropped footer.inc.php
|
2012-06-11 14:06:04 +01:00 |
|
Rouslan Placella
|
a054562100
|
PMA_Footer and PMA_Header no longer need to be singletons
|
2012-06-11 14:06:03 +01:00 |
|
Rouslan Placella
|
4a740376c8
|
Dropped header.inc.php in favor of the PMA_Header class
|
2012-06-11 14:06:02 +01:00 |
|
Michal Čihař
|
580aaa95c9
|
Make function return html instead of printing it
|
2012-06-04 10:45:34 +02:00 |
|
Michal Čihař
|
def435f054
|
Document function
|
2012-06-04 10:42:14 +02:00 |
|
Madhura Jayaratne
|
a8a6c69c96
|
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
|
2012-05-27 23:26:10 +05:30 |
|
Madhura Jayaratne
|
1427b2f2de
|
Fix function names: PMA_AddJSVar -> PMA_addJSVar
|
2012-05-25 22:43:23 +05:30 |
|
Marc Delisle
|
5c53fb643a
|
Fix merge conflicts
|
2012-05-24 12:34:15 -04:00 |
|
Marc Delisle
|
8b7b8a8ffe
|
Server status queries chart, with jqplot
Fix needed: legend wrongly displayed over the right border
|
2012-05-11 15:38:35 -04:00 |
|
Rouslan Placella
|
7b85c709a8
|
Dropped server_links.inc.php
|
2012-05-05 16:44:27 +01:00 |
|
Marc Delisle
|
dd00ac82c6
|
Add explanation
|
2012-05-02 13:53:49 -04:00 |
|
Rouslan Placella
|
49a7f12e4e
|
Include CodeMirror globally
|
2012-04-25 23:47:24 +01:00 |
|
Madhura Jayaratne
|
ba21546008
|
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
|
2012-04-13 22:33:43 +05:30 |
|
Madhura Jayaratne
|
fa9aaea8c0
|
Coding style improvements
|
2012-04-13 20:57:17 +05:30 |
|
Jo Michael
|
8744f8cf66
|
+ rfe #3517354 [interface] Allow disabling CodeMirror with $cfg['CodemirrorEnable'] = false
|
2012-04-13 01:43:32 +02:00 |
|
Michal Čihař
|
5d54482c66
|
Drop $cfg['MainPageIconic'].
|
2012-04-11 15:34:27 +02:00 |
|
Marc Delisle
|
dd5aae9a67
|
jQuery UI is already included from common.inc.php
|
2012-04-09 09:09:07 -04:00 |
|
Jo Michael
|
321b8cc880
|
Added width and height attributes to ajax throbber img.
|
2012-04-07 16:02:47 +02:00 |
|
Dieter Adriaenssens
|
193ea6e5bf
|
improve coding style
|
2012-04-06 17:46:16 +02:00 |
|
