Commit Graph

81024 Commits

Author SHA1 Message Date
Madhura Jayaratne
62ac5b04ea Merge branch 'master' into charts
Conflicts:
	js/tbl_chart.js
2013-01-15 14:27:05 +05:30
Weblate
55ebbeeae4 Merge remote-tracking branch 'origin/master' 2013-01-15 09:29:35 +01:00
ProUser
84c35b75fb Translated using Weblate (Swedish)
Currently translated at 99.5% (2588 of 2602)
2013-01-15 09:29:16 +01:00
Michal Čihař
b586d8164a Merge remote-tracking branch 'weblate/master' 2013-01-15 09:25:23 +01:00
Pham Andrei
9433426417 Translated using Weblate (Romanian)
Currently translated at 55.5% (1444 of 2602)
2013-01-15 09:16:43 +01:00
Michal Čihař
b59d6dee04 Translated using Weblate (Czech)
Currently translated at 100.0% (2602 of 2602)
2013-01-15 09:15:57 +01:00
Michal Čihař
077a93b0e2 Merge remote-tracking branch 'origin/QA_3_5'
Conflicts:
	js/tbl_chart.js
2013-01-15 09:14:17 +01:00
Michal Čihař
7ddc71c033 Fix possibly wrong commas 2013-01-15 09:13:24 +01:00
Michal Čihař
7463acbe9f Merge remote-tracking branch 'origin/QA_3_5' 2013-01-15 09:12:48 +01:00
Michal Čihař
b23372a336 Escape HTML in titles of table charts
Conflicts:
	js/tbl_chart.js
2013-01-15 09:12:37 +01:00
Michal Čihař
b489fdffb6 Escape HTML in chart title 2013-01-15 09:11:43 +01:00
Michal Čihař
7e968cf30e Escape HTML in titles of table charts 2013-01-15 09:11:07 +01:00
Weblate
ae2a59f02d Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2013-01-15 09:10:00 +01:00
ProUser
fb0fb6c756 Translated using Weblate (Swedish)
Currently translated at 100.0% (2562 of 2562)
2013-01-15 09:09:51 +01:00
Pham Andrei
90ed3865ea Translated using Weblate (Romanian)
Currently translated at 60.2% (1543 of 2562)
2013-01-15 09:09:48 +01:00
Michal Čihař
75ab209aaf Translated using Weblate (Czech)
Currently translated at 100.0% (2562 of 2562)
2013-01-15 09:09:45 +01:00
Michal Čihař
d876574e61 Whitespace cleanup 2013-01-15 09:08:39 +01:00
Michal Čihař
d30aaaee73 Escape HTML in chart title 2013-01-15 09:08:32 +01:00
Madhura Jayaratne
303e999544 Validator for timeline charts 2013-01-15 07:08:17 +05:30
Madhura Jayaratne
34c676c1d1 Draw timeline charts with queries 2013-01-15 00:18:05 +05:30
Madhura Jayaratne
37a7aa9206 Auto resize to use full width 2013-01-14 20:48:56 +05:30
Madhura Jayaratne
91df297bb6 Fix query charts with the new chart library. Replace spline chart(not supported by jqPlot) with area chart. 2013-01-14 20:16:57 +05:30
Madhura Jayaratne
2fcfcf883b Abstract chart factory and chart classes that separate the contract and implementation. jqPlot specific implementations of these classes. 2013-01-14 20:11:55 +05:30
Robert Readman
8063d2270e Translated using Weblate (English (United Kingdom))
Currently translated at 100.0% (2602 of 2602)
2013-01-14 10:50:11 +01:00
Victor Volkov
8a130c58ff Translated using Weblate (Russian)
Currently translated at 100.0% (2602 of 2602)
2013-01-13 21:07:28 +01:00
Madhura Jayaratne
053d6c2ce0 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-01-12 19:22:01 +05:30
Madhura Jayaratne
a6333e40f4 Merge branch 'QA_3_5' 2013-01-12 19:21:10 +05:30
Weblate
761cf904ac Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2013-01-12 14:50:59 +01:00
Dong-bum Kim
662757a867 Translated using Weblate (Korean)
Currently translated at 40.6% (1040 of 2562)
2013-01-12 14:50:54 +01:00
Madhura Jayaratne
f5433d100d bug #3600322 [core] Visualize GIS data throws Fatal Error - Method signatures should match 2013-01-12 19:10:11 +05:30
Marc Delisle
1fe7ca8901 Coding standards 2013-01-12 07:15:24 -05:00
Marc Delisle
6ec99398df Merge pull request #131 from zixtor/master
Some visual improvements in monitor charts.
2013-01-12 04:09:11 -08:00
Atul Pratap Singh
23c84592da Free data values when they are out of sight 2013-01-12 00:45:35 +05:30
Atul Pratap Singh
e2aace700a Fix xaxis ticks display while changing refresh rate for monitor charts 2013-01-12 00:44:30 +05:30
Atul Pratap Singh
acc3fbaeb3 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-01-11 22:18:56 +05:30
Atul Pratap Singh
7e3888e715 Fix smooth lines plotting for monitor charts 2013-01-11 22:17:37 +05:30
Weblate
d9bf5a41dc Merge remote-tracking branch 'origin/master' 2013-01-11 15:20:00 +01:00
Dong-bum Kim
733c4971ee Translated using Weblate (Korean)
Currently translated at 38.1% (992 of 2602)
2013-01-11 15:19:55 +01:00
Michal Čihař
af1e859845 Use mock values instead of mock html 2013-01-11 15:19:29 +01:00
Michal Čihař
dc3dceee9d Another duplicated testcase 2013-01-11 15:19:29 +01:00
Michal Čihař
c20a83df3e Another duplicate test case 2013-01-11 15:19:29 +01:00
Michal Čihař
b7cdf5aeea Merge identical testcases 2013-01-11 15:19:29 +01:00
Michal Čihař
c0ae72cc08 Use include in function 2013-01-11 15:19:28 +01:00
Marc Delisle
96e5e54e0a Upgraded CodeMirror to 2.37 2013-01-10 13:25:34 -05:00
Michal Čihař
40b6311c99 Merge remote-tracking branch 'origin/QA_3_5' 2013-01-10 16:16:13 +01:00
Michal Čihař
9587b62147 Translated using Weblate (Serbian (latin))
Currently translated at 73.7% (1889 of 2562)
2013-01-10 16:15:10 +01:00
Michal Čihař
5635220a1b Translated using Weblate (Serbian)
Currently translated at 33.8% (865 of 2562)
2013-01-10 16:15:10 +01:00
Michal Čihař
0e49763790 Translated using Weblate (Romanian)
Currently translated at 60.1% (1539 of 2562)
2013-01-10 16:15:10 +01:00
Michal Čihař
949963510f Translated using Weblate (Portuguese (Brazil))
Currently translated at 98.3% (2519 of 2562)
2013-01-10 16:15:09 +01:00
Michal Čihař
6540e4ac1d Translated using Weblate (Portuguese)
Currently translated at 50.7% (1300 of 2562)
2013-01-10 16:15:09 +01:00