Commit Graph

190 Commits

Author SHA1 Message Date
Marc Delisle
7e43534848 Merge commit '54e2c0f' 2014-05-23 10:30:45 -04:00
Marc Delisle
c1756b96e3 Merge commit '56d5ef0' 2014-05-23 10:30:10 -04:00
Atul Pratap Singh
54e2c0f82a Use setdate and make input readonly
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-05-22 23:05:55 +05:30
Atul Pratap Singh
56d5ef04a0 Date format problem in firefox, use jquery datepicker to get date
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-05-22 21:49:46 +05:30
Madhura Jayaratne
f79ab273a2 Merge branch 'QA_4_2' 2014-05-18 14:16:16 +05:30
Madhura Jayaratne
117490393a Merge branch 'QA_4_2' of github.com:phpmyadmin/phpmyadmin into QA_4_2
Conflicts:
	ChangeLog
2014-05-18 14:11:56 +05:30
Madhura Jayaratne
33343fbdf4 bug #4398 Monitor should fit into screen width
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-05-18 14:09:51 +05:30
Marc Delisle
06d0e5c5dd Merge commit '1a3c958' 2014-05-15 12:49:50 -04:00
Atul Pratap Singh
1a3c958f39 Add datepicker to monmitor log analyzer
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-05-16 02:29:14 +05:30
Marc Delisle
2e089b4d8b Add a JQplot option to change the dot size in server status monitor
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-09 15:19:06 +02:00
Michal Čihař
bb90750766 Fix syntax error
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-08 17:40:34 +02:00
Michal Čihař
d681d77263 Use dot notation for accessing array members
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-06 19:48:03 +02:00
Michal Čihař
548c1a57d0 Simplify referencing messages
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-06 14:59:17 +02:00
Michal Čihař
5284882d3d Use native browser support for JSON
It's there in anything recent (only not supported in IE 6 and 7 which we
don't support anyway).

Signed-off-by: Michal Čihař <michal@cihar.com>
2014-03-19 12:33:46 +01:00
Michal Čihař
0d8f510c22 Use JSON parser from jQuery instead of JSON plugin
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-03-19 12:33:46 +01:00
Atul Pratap Singh
69e504ccf8 Fix error reports 1678/1757 chartObj.chart.series[j].setData is not a function
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-03-01 19:01:25 +05:30
Umair Khan
733318f7c3 bugfix #4248
Signed-off-by: Umair Khan <omerjerk@gmail.com>
2014-01-25 16:23:25 +05:30
Atul Pratap Singh
31016c023c Fix error_reports 9,16,77: Remove unused highcarts code
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-01-05 00:52:19 +05:30
Michal Čihař
50deebcbdf Coding style: Bad line breaking before logical operators 2013-10-02 12:07:15 +02:00
Michal Čihař
4f5a9e40a2 Coding style: line breaking before + 2013-10-02 11:45:46 +02:00
Michal Čihař
26e990169f Coding style: whitespace around operators 2013-09-30 11:24:11 +02:00
Michal Čihař
501cb5a743 Coding style: use {} for if statements 2013-09-30 11:22:24 +02:00
Madhura Jayaratne
e345d72a52 Line wrapping for CodeMirror edit areas 2013-09-09 18:58:36 +05:30
Atul Pratap Singh
fa8176def5 Show meaningful message if database name is unknown in server's logs, as suggested by Marc 2013-08-18 20:42:21 +05:30
Atul Pratap Singh
ddc27165c2 Error wasn't displayed 2013-08-18 20:40:59 +05:30
Atul Pratap Singh
1aa0ac8b79 PMA_SQLPrettyPrint distorted the query in monitor analyzer, bug#4054 2013-08-18 20:37:57 +05:30
Michal Čihař
5263a05169 Correct spacing of functions 2013-07-30 14:36:43 +02:00
Atul Pratap Singh
4351cabc85 allow tooltip overflow, hide axis overflow explicitly 2013-07-25 21:33:38 +05:30
Atul Pratap Singh
1c38c7cf19 Format values in Questions/Connections chart 2013-07-25 19:48:47 +05:30
Michal Čihař
acb997206e Add wrapper function for formatting datetime
This makes it easier to use and correctly converts params which
formatTime expects.
2013-07-08 14:44:16 +02:00
Michal Čihař
f96ed7c363 Use jQuery UI for formatting date strings 2013-07-08 11:26:29 +02:00
Atul Pratap Singh
e2163b39e9 When rearranging charts, timespan shouldn't be drawn 2013-05-24 01:41:48 +05:30
Atul Pratap Singh
b30b26f832 Show log analyze dialog if timespan width more than zero 2013-05-24 01:35:37 +05:30
Atul Pratap Singh
0e23451efa Wrap chart and legend in a single div, fix rearrange charts feature in status monitor 2013-05-24 01:30:02 +05:30
Michal Čihař
48b39b7e3b Various javascript fixes
- line breaking around operators
- wrong scope of variables
2013-04-26 09:45:42 +02:00
Atul Pratap Singh
d10eb3680d null !== undefined in type safe comparison 2013-04-20 21:47:45 +05:30
Atul Pratap Singh
150deacce9 Improved tooltip for monitor charts 2013-04-17 15:36:42 +05:30
Michal Čihař
ae20e5c1ab Fix some forgotten messages conversions 2013-04-16 17:16:19 +02:00
Michal Čihař
27b213431c Reference javascript messages by dot notation instead of using ['strFoo'] 2013-04-16 13:32:51 +02:00
Michal Čihař
7126e208b0 Another set of js fixes (found after raising limit of errors) 2013-04-16 13:05:31 +02:00
Michal Čihař
cec7c0e8e3 Rempove extra spaces from js code 2013-04-16 12:05:19 +02:00
Michal Čihař
ca69a0c93e Various spacing fixes 2013-04-16 11:52:47 +02:00
Michal Čihař
c2dca8ea70 Fix indentation 2013-04-16 11:41:55 +02:00
Michal Čihař
66c60852f3 fix spacing 2013-04-15 16:26:06 +02:00
Michal Čihař
a6f93e99ee Use consistent indentation 2013-04-15 16:23:43 +02:00
Michal Čihař
e2571c5628 Various javascript spacing fixes 2013-04-15 16:20:04 +02:00
Michal Čihař
a1b6f206b2 Various spacing and identation fixes 2013-04-15 15:13:14 +02:00
Michal Čihař
c935413fcc Various javascript fixes
- missing ;
- confusing !
2013-04-15 14:10:53 +02:00
Michal Čihař
e6517db98a More javascript cleanup, more fixes of === / !=== 2013-04-15 13:25:50 +02:00
Michal Čihař
cc7bef87d5 Some forgotten === conversion 2013-04-15 12:14:26 +02:00