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 |
|
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 |
|
Yuichiro Takahashi
|
6defae278e
|
Translated using Weblate.
|
2012-04-02 13:23:09 +02:00 |
|
Michal Čihař
|
648ad3ebd2
|
Merge pull request #12 from alexukf/small_fixes
remove global.inc.php
|
2012-04-02 04:23:05 -07:00 |
|
jandos omirb3k
|
2ea08885e4
|
Translated using Weblate.
|
2012-04-02 11:31:54 +02:00 |
|
Michal Čihař
|
14ed639371
|
Merge remote-tracking branch 'origin/QA_3_5'
|
2012-04-02 09:55:58 +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ř
|
4c7d3c0e28
|
Merge remote-tracking branch 'origin/master'
|
2012-04-02 09:53:01 +02:00 |
|
Michal Čihař
|
517aa61271
|
Coding style
|
2012-04-02 09:51:15 +02:00 |
|
Michal Čihař
|
7464f215aa
|
Merge remote-tracking branch 'origin/QA_3_5'
|
2012-04-02 09:50: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 |
|
Abdurahman Taskibaev
|
9894b68e49
|
Translated using Weblate.
|
2012-04-02 09:48:20 +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 |
|
Sabions slOve
|
f15e0399de
|
Translated using Weblate.
|
2012-04-02 05:02:14 +02:00 |
|
Yuichiro Takahashi
|
5b07e6cd63
|
Translated using Weblate.
|
2012-04-02 05:02:12 +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 |
|
Alex Marin
|
8e37333b76
|
modified Documentation regarding global.inc.php
|
2012-04-02 03:56:00 +03:00 |
|
Alex Marin
|
c5f9cafa97
|
deleted global.inc.php after moving its explanatory comments
|
2012-04-02 03:56:00 +03:00 |
|
Alex Marin
|
6a9eae6fb8
|
moved PMA_transformation_global_html_replace to another file and removed include paths
|
2012-04-02 03:56:00 +03:00 |
|
Michal Čihař
|
07e5c39772
|
Merge remote-tracking branch 'origin/master'
|
2012-04-01 20:20:10 +02:00 |
|
Jo Michael
|
5b09d0f066
|
Cleanup HTML5 validity issues
|
2012-04-01 20:14:50 +02:00 |
|
Jo Michael
|
00b897ba34
|
Allow js_includes wrapped in IE-conditional comments
|
2012-04-01 19:15:02 +02:00 |
|
Jo Michael
|
570e7cdae8
|
Fixed spacing for inline edit link
|
2012-04-01 16:28:43 +02:00 |
|
Michal Čihař
|
503c0dd720
|
Merge remote-tracking branch 'origin/master'
|
2012-04-01 16:20:19 +02:00 |
|
Jo Michael
|
844c0e5e79
|
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
|
2012-04-01 16:19:13 +02:00 |
|
Jo Michael
|
4f0a8e961d
|
Fixed wrong padding on errors and messages in RTL locales
|
2012-04-01 16:17:33 +02:00 |
|
