Commit Graph

72234 Commits

Author SHA1 Message Date
Marc Delisle
511bf24dfa Merge branch 'MAINT_3_5_3' into QA_3_5 2012-10-08 11:15:51 -04:00
Marc Delisle
a65a9721a9 3.5.3 release 2012-10-08 11:15:22 -04:00
Madhura Jayaratne
f795458f89 Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5 2012-10-04 21:44:14 +05:30
Madhura Jayaratne
5bfdc6dd38 Merge branch 'MAINT_3_5_3' into QA_3_5 2012-10-04 21:42:49 +05:30
Madhura Jayaratne
6ea8fad3f9 triggers, routines, events : escape drop sql 2012-10-04 21:41:22 +05:30
Weblate
2bdd1b7192 Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-10-03 20:49:47 +02:00
Sergio Martins
fc266c2437 Translated using Weblate. 2012-10-03 20:49:44 +02:00
Sergio Martins
fb6ac5ac15 Translated using Weblate. 2012-10-03 20:49:41 +02:00
Edgaras Janušauskas
1c35e1d890 Translated using Weblate. 2012-10-03 20:49:39 +02:00
Dieter Adriaenssens
b27785affb Merge branch 'MAINT_3_5_3' into QA_3_5 2012-10-03 20:23:07 +02:00
Dieter Adriaenssens
cfd688d251 triggers, routines, events : escape sql queries in error messages 2012-10-03 20:22:25 +02:00
Victor Volkov
1b399f958a Translated using Weblate. 2012-09-29 15:19:51 +02:00
Marc Delisle
d2d77de352 Merge branch 'MAINT_3_5_3' into QA_3_5 2012-09-25 04:11:08 -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
50abc1cbb3 bug #3569577 [edit] Add routine parameter headers not valid for "function" 2012-09-24 21:56:17 +05:30
Madhura Jayaratne
3fe7816596 bug #3570212 [edit] uuid_short() is a no-arguments function 2012-09-24 21:39:39 +05:30
Marc Delisle
2caf953171 3.5.4-dev 2012-09-24 07:17:20 -04:00
Marc Delisle
f411272936 Merge branch 'MAINT_3_5_3' into QA_3_5 2012-09-24 07:15:45 -04:00
Marc Delisle
def0d618d7 3.5.3-rc1 2012-09-24 07:13:44 -04:00
Madhura Jayaratne
ca189ad90d bug #3570786 [edit] Datepicker for date and datetime fields is broken 2012-09-23 08:36:51 +05:30
Atul Pratap Singh
d1a7a8560a Merge branch 'QA_3_5-jqplot' into QA_3_5 2012-09-22 16:30:58 +05:30
Atul Pratap Singh
af0e34e274 Fix jqplot charts display in IE versions less than 9 2012-09-22 16:19:16 +05:30
Marc Delisle
787a0aa573 Merge branch 'QA_3_5-jqplot' into QA_3_5 2012-09-21 06:25: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
Robert Readman
75448e3673 Translated using Weblate. 2012-09-19 14:17:26 +02:00
Anusuk Sangubon
04daaae15a Translated using Weblate. 2012-09-19 13:30:57 +02:00
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
ChihChnug Ma
32c70e7970 Translated using Weblate. 2012-09-17 10:13:01 +02:00
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
Atul Pratap Singh
5957570bf5 Re-enable javascript loading for monitor tab 2012-09-17 02:46:36 +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
eae555520c temporarily change loading mechanism, to enable Firebug tracing 2012-09-16 08:28:29 -04:00
Weblate
4e80101320 Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-09-15 20:31:39 +02:00
Aputsiaq Niels Janussen
86a62c7e6e Translated using Weblate. 2012-09-15 20:31:36 +02:00
Madhura Jayaratne
7ab1bfc4e6 bug #3567684 [edit] Pasting value doesn't clear null checkbox 2012-09-16 00:00:26 +05:30
Aputsiaq Niels Janussen
e036ddfcca Translated using Weblate. 2012-09-12 23:28:01 +02:00
Weblate
5dd97a660c Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-09-11 18:44:41 +02:00
J. M
b5558b21b8 Translated using Weblate. 2012-09-11 18:44:38 +02:00
Marc Delisle
095083369a Remove call to old Highcharts code 2012-09-11 12:42:31 -04:00