Michal Čihař
aebacc391f
Various fixes in coding style
2012-09-10 15:39:26 +02:00
Michal Čihař
add93f38a1
Various fixes in coding style
2012-09-10 15:18:13 +02:00
Michal Čihař
8b57c837b7
Docblocks improvements
2012-09-10 14:52:25 +02:00
Michal Čihař
c9eba6a46c
Update TCPDF to 5.9.183
...
Changelog:
5.9.183 (2012-09-07)
- A problem with font names normalization was fixed.
5.9.182 (2012-09-05)
- Bug item #3564982 "Infinite loop in Write() method" was fixed.
5.9.181 (2012-08-31)
- composer.json file was added.
- Bug item #3563369 "Cached images are not unlinked some time" was fixed.
2012-09-10 10:49:32 +02:00
Atul Pratap Singh
a83e24ae0c
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
2012-09-10 07:45:51 +00:00
Atul Pratap Singh
a75181d2e1
Merge branch 'QA_3_5'
2012-09-10 07:45:06 +00:00
Atul Pratap Singh
630f2ae45d
Fix monitor charts display in IE
2012-09-10 07:44:22 +00:00
Michal Čihař
d947d9c35f
This test usually takes slightly longer
2012-09-10 08:12:27 +02:00
Atul Pratap Singh
cd6f0d7ad7
Merge branch 'QA_3_5'
2012-09-10 05:58:23 +00:00
Atul Pratap Singh
fe69e4b737
Make chart background transparent in zoom search
2012-09-10 05:57:29 +00:00
Atul Pratap Singh
9e97286571
Make chart background transparent in table->browse
2012-09-09 23:50:17 +05:30
Marc Delisle
f724a9ae91
Bug #3554601 Cannot copy a database that contains views
2012-09-09 08:39:10 -04:00
Marc Delisle
2bb2f2bf54
Undefined variable in this function
2012-09-09 08:07:27 -04:00
Marc Delisle
a4499ec9cd
Merge branch 'QA_3_5'
2012-09-09 07:40:51 -04:00
Marc Delisle
3d9243162b
Remove extraneous comma
2012-09-09 07:40:24 -04:00
Marc Delisle
814166fa7c
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
2012-09-09 07:36:56 -04:00
Marc Delisle
e491ab1c8a
Fix merge conflicts
2012-09-09 07:35:38 -04:00
Marc Delisle
467cd60a00
Merge branch 'QA_3_5'
2012-09-09 07:34:24 -04:00
Marc Delisle
dce8431003
Remove extraneous comma
2012-09-09 07:34:07 -04:00
Weblate
e53ad4fde7
Merge remote-tracking branch 'origin/master'
2012-09-09 13:27:20 +02:00
Vojislav Pavić
e2ffae058a
Translated using Weblate.
2012-09-09 13:27:17 +02:00
مترجم حرّ
693b0dcf29
Translated using Weblate.
2012-09-09 13:26:51 +02:00
Weblate
fbf05f5879
Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5
2012-09-09 13:26:44 +02:00
Vojislav Pavić
866153383a
Translated using Weblate.
2012-09-09 13:26:42 +02:00
مترجم حرّ
ad615d61ad
Translated using Weblate.
2012-09-09 13:26:40 +02:00
Marc Delisle
366477a8d3
Fix from codemirror 2.22 for a IE problem
2012-09-09 07:20:44 -04:00
Marc Delisle
89c60cbbef
Fix merge conflicts
2012-09-09 06:40:05 -04:00
Marc Delisle
08eb5ef035
Merge branch 'QA_3_5'
2012-09-09 06:34:06 -04:00
Marc Delisle
f24b163fd6
These extra commas are fatal for Internet Explorer 9
2012-09-09 06:30:56 -04:00
Weblate
1662302398
Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5
2012-09-08 14:47:54 +02:00
مترجم حرّ
10d7183b59
Translated using Weblate.
2012-09-08 14:47:47 +02:00
مترجم حرّ
cced20fb0e
Translated using Weblate.
2012-09-08 14:47:45 +02:00
Marc Delisle
be47d23a38
Use correct jqplot reference for axis labels
2012-09-08 08:47:13 -04:00
Marc Delisle
8ade1115d7
Initial display is wrong
2012-09-08 08:40:07 -04:00
Marc Delisle
fb7b1c1582
Unused code
2012-09-08 08:34:36 -04:00
Marc Delisle
9b07f1237a
Incorrect reference to chart type
2012-09-08 08:30:06 -04:00
Marc Delisle
eca1c28e16
Adapt to new multiple selector
2012-09-08 08:17:18 -04:00
Marc Delisle
a5d0fdad0e
Fix merge conflicts
2012-09-08 07:59:06 -04:00
Marc Delisle
7664d049b6
Fix merge conflicts
2012-09-08 07:33:11 -04:00
Marc Delisle
b04e2be72a
ChangeLog entry
2012-09-08 07:31:26 -04:00
Marc Delisle
a74998d560
Spline
2012-09-08 07:25:54 -04:00
Marc Delisle
04698355e4
Resizer for Display chart
2012-09-08 07:12:21 -04:00
Madhura Jayaratne
2be4178527
Merge branch 'QA_3_5'
...
Conflicts:
libraries/import/xml.php
po/ar.po
po/de.po
2012-09-08 10:31:00 +05:30
Madhura Jayaratne
e41f19969a
bug #3553068 [import] Table import from XML file fails
2012-09-08 10:22:22 +05:30
Marc Delisle
000362d747
Stacked series
2012-09-07 14:07:53 -04:00
Marc Delisle
1b91586708
Column-specific legends
2012-09-07 13:58:36 -04:00
Marc Delisle
8d6d586552
This renderer causes an incorrect display
2012-09-07 13:45:52 -04:00
Marc Delisle
d5fbbe8ed2
Support specific column
2012-09-07 13:32:12 -04:00
Marc Delisle
25a8298f57
Legends work for pie
2012-09-07 13:04:57 -04:00
Marc Delisle
b1100e9fb7
Remove calling of highcharts
2012-09-07 13:01:54 -04:00