Commit Graph

73024 Commits

Author SHA1 Message Date
Michal Čihař
fffe0219d0 Merge remote-tracking branch 'origin/QA_3_5' 2012-04-04 09:52:28 +02:00
Michal Čihař
18ab75e372 Merge branch 'MAINT_3_5_0' into QA_3_5 2012-04-04 09:51:32 +02:00
Michal Čihař
99850585e2 Merge remote-tracking branch 'origin/QA_3_4' into MAINT_3_5_0 2012-04-04 09:51:12 +02:00
Berikbol Zharylkassyn
169f5b5f8a Translated using Weblate. 2012-04-04 09:41:03 +02:00
Marc Delisle
c4a1ffa45a Translated using Weblate. 2012-04-04 05:00:29 +02:00
Michal Čihař
7da7552901 Merge remote-tracking branch 'origin/master' 2012-04-03 23:10:50 +02:00
Jo Michael
9a5ced626a Better implementation of rfe #3488185 using a jQuery UI dialog 2012-04-03 23:10:24 +02:00
Michal Čihař
2edae726cc Merge remote-tracking branch 'origin/master' 2012-04-03 18:58:34 +02:00
Burak Yavuz
44ce68a685 Translated using Weblate. 2012-04-03 18:58:31 +02:00
Marc Delisle
de9a8947f2 Translated using Weblate. 2012-04-03 18:58:29 +02:00
Michal Čihař
6376ff297e Merge remote-tracking branch 'origin/MAINT_3_5_0' into MAINT_3_5_0 2012-04-03 18:58:08 +02:00
Burak Yavuz
8bec777e1b Translated using Weblate. 2012-04-03 18:58:05 +02:00
Marc Delisle
9750317f42 Translated using Weblate. 2012-04-03 18:58:04 +02:00
Marc Delisle
5fedf1aa3f Merge branch 'QA_3_5' 2012-04-03 12:57:31 -04:00
Marc Delisle
86c29301c8 Merge branch 'MAINT_3_5_0' into QA_3_5 2012-04-03 12:57:11 -04:00
Marc Delisle
8c3a77f3ad Path disclosure fix 2012-04-03 12:56:58 -04:00
Marc Delisle
8696766bd9 ChangeLog entry
Cosmetic cleanup
2012-04-03 07:46:06 -04:00
Thilina Buddika Abeyrathna
5c24ecdc92 Patch #3507001 Contest-4 for rfe #2046140 2012-04-03 07:42:46 -04:00
Michal Čihař
d384351c0e Merge remote-tracking branch 'origin/QA_3_5' 2012-04-03 09:59:01 +02:00
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
Michal Čihař
b0f96d7f81 Merge remote-tracking branch 'origin/master' 2012-04-03 04:34:28 +02:00
Jo Michael
330a1aa746 rfe #3488185 draggable columns vs copy column name 2012-04-03 04:33:57 +02:00
Michal Čihař
3d6c0f6cf8 Merge remote-tracking branch 'origin/master' 2012-04-03 03:14:17 +02:00
Everton R
19f1c1f81d Translated using Weblate. 2012-04-03 03:14:13 +02:00
Jo Michael
dd3c443591 rfe #3507804 Session upload progress (PHP 5.4) 2012-04-03 03:13:57 +02:00
Michal Čihař
d9c64e91fc Merge remote-tracking branch 'origin/master' 2012-04-02 23:16:42 +02:00
Rouslan Placella
58c8b7662c Merge branch 'QA_3_5' 2012-04-02 22:16:28 +01: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
Michal Čihař
e8a37c2ca9 Merge remote-tracking branch 'origin/master' 2012-04-02 23:14:47 +02:00
Everton R
7cbbcbb542 Translated using Weblate. 2012-04-02 23:14:41 +02:00
Rouslan Placella
22f57c7fca Merge branch 'QA_3_5' 2012-04-02 22:14:05 +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
64e9dd21cb Merge branch 'QA_3_5'
Conflicts:
	ChangeLog
2012-04-02 22:07:25 +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ř
0787ce9587 Merge remote-tracking branch 'origin/QA_3_5' 2012-04-02 15:28:16 +02: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ř
48c2f5906b Merge remote-tracking branch 'origin/master' 2012-04-02 14:49:26 +02:00
Yasitha Pandithawatta
1def2973ac PmaSeleniumPrivilegesTest and PmaSeleniumXssTest are fixed 2012-04-02 14:47:14 +02:00
Michal Čihař
d3cb706ff8 Merge remote-tracking branch 'origin/master' 2012-04-02 13:23:13 +02:00
Abdurahman Taskibaev
6504d1b227 Translated using Weblate. 2012-04-02 13:23:09 +02:00