gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
99,872 Commits 12 Branches 481 Tags 2.4 GiB
d248f77458
Commit Graph

204 Commits

Author SHA1 Message Date
Madhura Jayaratne
d32f555a56 bug Missing sort icons in monitor 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 10:35:16 +05:30
Madhura Jayaratne
f74969651d Use b_help icon here 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 10:08:51 +05:30
Madhura Jayaratne
6431883648 Missing tooltip in monitor 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 09:53:43 +05:30
Ann + J.M
29ec69c849 Merge branch 'master' into ZweiSteinSoft/rfe/1550-pma-url-getcommon-new-style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-22 16:58:00 +02:00
Marc Delisle
dde9ca7c79 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-21 10:38:46 -04:00
Madhura Jayaratne
7b8962dede bug #4563 [security] XSS in monitor query analyzer 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-21 08:45:09 +05:30
Ann + J.M
a540e6ba87 More fixes to new PMA_URL_getCommon style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-18 19:42:39 +02:00
Atul Pratap Singh
c70e109bd6 Feature#1546 Replace js sprintf library with a better one 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-10-03 17:08:25 +05:30
Atul Pratap Singh
6c83a2f2e3 Merge commit 'a020eac11a26977295cf2439ddd2e5b4af2c88fe' 
Conflicts:
	js/config.js
	js/db_search.js
	js/functions.js
	js/makegrid.js
	js/server_privileges.js
	js/tbl_structure.js
 2014-10-01 20:42:21 +05:30
Atul Pratap Singh
a020eac11a Add js checks in multiple files if data is undefined 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-10-01 10:00:54 +05:30
Marc Delisle
38b8cd7a80 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-17 12:40:53 -04:00
Madhura Jayaratne
cd9f302bf7 bug #4503 [security] Self-XSSes in monitor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-17 08:50:27 -04:00
Chirayu Chiripal
32511719b1 RFE-1490 Dynamic process list 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-24 19:13:21 +05:30
Hugues Peccatte
40def1a7a2 Fix 'function declaration in loop' scrutinizer errors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-19 21:42:59 +02:00
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