Commit Graph

70112 Commits

Author SHA1 Message Date
Michal Čihař
893d094dc0 Merge branch 'MAINT_3_5_0' into QA_3_5 2012-04-03 09:58:02 +02:00
Michal Čihař
092eee8d53 Merge remote-tracking branch 'origin/QA_3_4' into MAINT_3_5_0 2012-04-03 09:57:55 +02:00
Everton R
3c8c264b13 Translated using Weblate. 2012-04-03 05:01:03 +02:00
Everton R
4d2f1cb8d7 Translated using Weblate. 2012-04-03 05:00:28 +02:00
Rouslan Placella
1dd6b71a78 Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5
Conflicts:
	ChangeLog
2012-04-02 22:15:42 +01:00
Atul Pratap Singh
2499687158 Fix typo introduced in 89fc70 2012-04-02 22:13:41 +01:00
Madhura Jayaratne
53d427d0b8 bug #3512916 [display] Right frame reloads after displaying SQL result(zero rows)
Conflicts:

	ChangeLog
2012-04-02 22:13:20 +01:00
Rouslan Placella
4c52281a93 Updated changelog 2012-04-02 22:04:39 +01:00
Rouslan Placella
24726360c4 Fixed missing Codemirror for inline query edit when exporting a result set 2012-04-02 22:03:26 +01:00
Rouslan Placella
322ea313bc Merge branch 'MAINT_3_5_0' into QA_3_5 2012-04-02 22:03:01 +01:00
Rouslan Placella
f8d4f21ef9 Revert "Fixed missing Codemirror for inline query edit when exporting a result set"
This reverts commit 3998a38900.
2012-04-02 22:00:45 +01:00
Michal Čihař
49b0ce4472 Merge branch 'MAINT_3_5_0' into QA_3_5 2012-04-02 15:27:24 +02:00
Michal Čihař
53df6ad399 Merge remote-tracking branch 'origin/QA_3_4' into MAINT_3_5_0 2012-04-02 15:27:05 +02:00
Yuichiro Takahashi
6158a769ea Translated using Weblate. 2012-04-02 15:25:20 +02:00
Yuichiro Takahashi
6072fa8537 Translated using Weblate. 2012-04-02 15:25:18 +02:00
Michal Čihař
67f5ba5bf3 Merge branch 'MAINT_3_5_0' into QA_3_5 2012-04-02 09:55:05 +02:00
Michal Čihař
94eb2dd6c5 Merge remote-tracking branch 'origin/QA_3_4' into MAINT_3_5_0 2012-04-02 09:54:43 +02:00
Michal Čihař
2db8da2ef9 Merge remote-tracking branch 'origin/MAINT_3_5_0' into MAINT_3_5_0 2012-04-02 09:50:11 +02:00
Michal Čihař
1d70667bdb Merge branch 'MAINT_3_5_0' into QA_3_5 2012-04-02 09:49:48 +02:00
Michal Čihař
e7517ed268 Merge remote-tracking branch 'origin/QA_3_4' into MAINT_3_5_0 2012-04-02 09:49:01 +02:00
Michal Čihař
f9db7e790c Merge remote-tracking branch 'origin/QA_3_4' into QA_3_4 2012-04-02 09:48:03 +02:00
Michal Čihař
8972ac9c15 Verify we got string 2012-04-02 09:47:46 +02:00
Yuichiro Takahashi
f475825f1f Translated using Weblate. 2012-04-02 05:01:06 +02:00
Marc Delisle
e654bb428b Translated using Weblate. 2012-04-02 05:01:04 +02:00
Yuichiro Takahashi
244a8c2c60 Translated using Weblate. 2012-04-02 05:00:35 +02:00
Marc Delisle
303a8c7770 Translated using Weblate. 2012-04-02 05:00:33 +02:00
Cédric Corazza
4066efe556 Translated using Weblate. 2012-04-01 15:15:43 +02:00
Cédric Corazza
1719f09e7d Translated using Weblate. 2012-04-01 15:15:35 +02:00
Burak Yavuz
355a9110d3 Translated using Weblate. 2012-04-01 05:00:26 +02:00
Matías Bellone
7d1e85b713 Translated using Weblate. 2012-04-01 05:00:25 +02:00
Madhura Jayaratne
f61e656ec0 Translated using Weblate. 2012-04-01 05:00:24 +02:00
Dieter Adriaenssens
4f27ea6afc Translated using Weblate. 2012-04-01 05:00:23 +02:00
Michal Čihař
3cd3386f9c Merge remote-tracking branch 'origin/MAINT_3_5_0' into MAINT_3_5_0 2012-03-31 23:03:07 +02:00
Matías Bellone
840bb8b4c6 Translated using Weblate. 2012-03-31 23:02:59 +02:00
Madhura Jayaratne
7086e81ef9 Translated using Weblate. 2012-03-31 23:02:58 +02:00
Dieter Adriaenssens
8f0cb76a44 Translated using Weblate. 2012-03-31 23:02:56 +02:00
Dieter Adriaenssens
22184cdbfe Merge branch 'MAINT_3_5_0' into QA_3_5 2012-03-31 23:02:17 +02:00
Dieter Adriaenssens
911c76261e add Dieter Adriaenssens to credits 2012-03-31 23:01:48 +02:00
Dieter Adriaenssens
a3c4c65bc4 Translated using Weblate. 2012-03-31 22:08:30 +02:00
Atul Pratap Singh
62af346844 Fix typo introduced in 89fc70 2012-03-31 13:31:13 +05:30
Madhura Jayaratne
06498e6f52 Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5 2012-03-31 12:00:37 +05:30
Madhura Jayaratne
89fc705b2d bug #3512916 [display] Right frame reloads after displaying SQL result(zero rows) 2012-03-31 11:51:09 +05:30
Burak Yavuz
3d4eab97c9 Translated using Weblate. 2012-03-31 05:00:30 +02:00
Alex Marin
6f8f7baaf7 Translated using Weblate. 2012-03-31 05:00:29 +02:00
Frank TheRabbit
98dda2a909 Translated using Weblate. 2012-03-31 00:44:22 +02:00
Frank TheRabbit
db7b9514b1 Translated using Weblate. 2012-03-31 00:44:12 +02:00
Michal Čihař
f6fac3f66b Merge remote-tracking branch 'origin/MAINT_3_5_0' into MAINT_3_5_0 2012-03-31 00:28:02 +02:00
Burak Yavuz
0643878961 Translated using Weblate. 2012-03-31 00:27:59 +02:00
Alex Marin
4ada6a09d9 Translated using Weblate. 2012-03-31 00:27:58 +02:00
Kęstutis
d8c87b9c97 Translated using Weblate. 2012-03-31 00:27:57 +02:00