Commit Graph

78641 Commits

Author SHA1 Message Date
Michal Čihař
d233182d3b Pass correct parameters to _getInsDelAndOrCell 2012-09-04 15:10:45 +02:00
Burak Yavuz
d1078a19b2 Translated using Weblate. 2012-09-04 12:09:55 +02:00
Michal Čihař
7d5f433869 Translated using Weblate. 2012-09-04 10:46:51 +02:00
Panagiotis Papazoglou
ad9845c345 Translated using Weblate. 2012-09-04 10:33:02 +02:00
Michal Čihař
75e990dd45 Merge remote-tracking branch 'origin/QA_3_5' 2012-09-04 10:14:12 +02:00
Vojislav Pavić
ff1a14a7f1 Translated using Weblate. 2012-09-04 10:13:34 +02:00
Michal Čihař
a693d0cc3b Merge remote-tracking branch 'weblate/master'
Conflicts:
	po/sr@latin.po
2012-09-04 10:12:50 +02:00
Vojislav Pavić
2234feb86f Translated using Weblate. 2012-09-04 10:09:04 +02:00
Vojislav Pavić
a20cee6587 Translated using Weblate. 2012-09-04 08:58:58 +02:00
Michal Čihař
14d7b599a9 Merge remote-tracking branch 'weblate/master'
Conflicts:
	po/sr@latin.po
2012-09-04 08:58:40 +02:00
Michal Čihař
da9f9de8ea Merge remote-tracking branch 'origin/QA_3_5' 2012-09-04 08:56:48 +02:00
Weblate
52b58d63ad Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-09-03 21:03:28 +02:00
Vojislav Pavić
0ec98eedce Translated using Weblate. 2012-09-03 21:03:26 +02:00
Vojislav Pavić
3f3d27ecc1 Translated using Weblate. 2012-09-03 21:03:23 +02:00
مترجم حرّ
c967a5aab6 Translated using Weblate. 2012-09-03 21:03:20 +02:00
Atul Pratap Singh
c35f55c8d8 Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5 2012-09-04 00:32:59 +05:30
Vojislav Pavić
5569cb51ac Translated using Weblate. 2012-09-03 21:02:44 +02:00
Atul Pratap Singh
dc84c463b8 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-09-04 00:31:07 +05:30
Atul Pratap Singh
aef8644ca2 Merge branch 'QA_3_5' 2012-09-04 00:27:39 +05:30
Atul Pratap Singh
d5b4856194 Merge branch 'QA_3_5-jqplot' into QA_3_5 2012-09-04 00:26:07 +05:30
Atul Pratap Singh
10ebddaf89 jqplot: y axis autoscaling enabled, jqplot's autoscale didn't seem to work 2012-09-04 00:24:05 +05:30
Vojislav Pavić
eb54f2227c Translated using Weblate. 2012-09-03 20:00:19 +02:00
Dieter Adriaenssens
4537b6b03a update po files 2012-09-03 19:58:49 +02:00
Dieter Adriaenssens
9727ee246c improve message, wrap long line 2012-09-03 19:56:01 +02:00
Atul Pratap Singh
6eadd03c80 jqplot: fix to plot multiple series 2012-09-03 22:38:52 +05:30
Weblate
61831e2061 Merge remote-tracking branch 'origin/master' 2012-09-03 18:06:30 +02:00
مترجم حرّ
96ac9da632 Translated using Weblate. 2012-09-03 18:06:25 +02:00
Dieter Adriaenssens
1f86e2fb50 improve coding style 2012-09-03 18:06:02 +02:00
Dieter Adriaenssens
4e7383d21c simplify code, wrap long lines 2012-09-03 18:05:50 +02:00
Dieter Adriaenssens
b947fd63c3 improve message 2012-09-03 18:05:01 +02:00
Dieter Adriaenssens
1136a46c74 improve coding style, fix indentation 2012-09-03 18:05:01 +02:00
Michal Čihař
2d8dea9702 Merge remote-tracking branch 'origin/QA_3_5' 2012-09-03 15:04:04 +02:00
Michal Čihař
a547f3d3e2 Escape json reply received from server 2012-09-03 15:03:34 +02:00
Michal Čihař
50edafc088 Load JSON rather than javascript from phpmyadmin.net
Conflicts:
	js/functions.js
	libraries/Header.class.php
2012-09-03 15:03:22 +02:00
Michal Čihař
05a7630c09 Escape json reply received from server 2012-09-03 14:57:59 +02:00
Michal Čihař
8b3756a8d9 Various coding style improvements 2012-09-03 14:51:13 +02:00
Michal Čihař
5917daad9c Various improvements to docblocks 2012-09-03 14:38:09 +02:00
Michal Čihař
a1efa8021d Wrap some long lines 2012-09-03 14:34:30 +02:00
Michal Čihař
cb2a6e448f Merge remote-tracking branch 'origin/QA_3_5' 2012-09-03 09:05:40 +02:00
Michal Čihař
7c9129fa4f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-09-03 09:05:16 +02:00
Michal Čihař
ceaee4471b Fix format strings 2012-09-03 09:05:02 +02:00
Michal Čihař
572735471b Merge remote-tracking branch 'origin/QA_3_5' 2012-09-03 09:03:54 +02:00
Michal Čihař
de617792c9 Fix format strings 2012-09-03 09:03:45 +02:00
مترجم حرّ
0515899085 Translated using Weblate. 2012-09-03 09:02:06 +02:00
Vitor Barbosa
6994532d6b Translated using Weblate. 2012-09-03 09:01:48 +02:00
Rouslan Placella
b2140eaf55 Translated using Weblate. 2012-09-03 09:01:47 +02:00
مترجم حرّ
6a5986aab4 Translated using Weblate. 2012-09-03 09:01:44 +02:00
Dieter Adriaenssens
dfb51338ea fix coding style, wrap long lines 2012-09-02 21:34:24 +02:00
Weblate
fbb076aa78 Merge remote-tracking branch 'origin/master' 2012-09-02 21:03:31 +02:00
Vitor Barbosa
361518d730 Translated using Weblate. 2012-09-02 21:03:28 +02:00