Commit Graph

82179 Commits

Author SHA1 Message Date
Marc Delisle
bf5b2bd046 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-04-08 08:01:57 -04:00
Marc Delisle
f371ce50cb Fix merge conflicts 2013-04-08 08:01:19 -04:00
Marc Delisle
c19e71e4e0 Merge branch 'QA_4_0' 2013-04-08 08:00:58 -04:00
Marc Delisle
f508c9ba1b Fix merge conflicts 2013-04-08 08:00:26 -04:00
Marc Delisle
263cde44ad Merge branch 'QA_3_5' into QA_4_0 2013-04-08 07:59:49 -04:00
Marc Delisle
25748dbad9 Fix merge conflicts 2013-04-08 07:59:38 -04:00
Marc Delisle
4e8c8d7196 Merge branch 'MAINT_3_5_8' into QA_3_5 2013-04-08 07:59:07 -04:00
Marc Delisle
8dbce7e4a0 3.5.8 release 2013-04-08 07:58:07 -04:00
J.M
fdb2daf080 Merge branch 'mynetx/fast-filter-inputbox' 2013-04-08 13:54:01 +02:00
J.M
257afb8b6f Don't let fast-filter input placeholder flow behind custom clear button 2013-04-08 13:51:15 +02:00
J.M
765fa81a82 Disable custom fast-filter clear button for IE10+ 2013-04-08 13:46:57 +02:00
J.M
a6d04bc8e0 Merge branch 'browser-detection' 2013-04-08 13:23:12 +02:00
J.M
b49cc41940 Detect Internet Explorer 10 and 11 2013-04-08 13:19:39 +02:00
J.M
1de35ef88b Detect Firefox browser 2013-04-08 13:08:58 +02:00
J.M
0458afab28 Add HTML class for current browser and version 2013-04-08 13:00:21 +02:00
J.M
7c343b997f Use HTML5 placeholder attribute for fast-filter inputbox 2013-04-08 12:50:42 +02:00
J. M
9ea6eb4139 Translated using Weblate (German)
Currently translated at 100.0% (2562 of 2562)
2013-04-07 15:22:06 +02:00
Domen
a0f45416d4 Translated using Weblate (Slovenian)
Currently translated at 100.0% (2605 of 2605)
2013-04-07 15:09:35 +02:00
Domen
bd46d10d9d Translated using Weblate (Slovenian)
Currently translated at 100.0% (2605 of 2605)
2013-04-07 15:09:28 +02:00
Michal Čihař
98a688b1d7 Merge pull request #227 from ayushchd/webos_configtest
Added a test and fixed webos test for Darwin
2013-04-07 04:47:19 -07:00
Weblate
832956d393 Merge remote-tracking branch 'origin/master' 2013-04-07 12:17:12 +02:00
Weblate
f79727e9af Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-04-07 12:10:57 +02:00
Yungu Kim
b5bbda0fc1 Translated using Weblate (Korean)
Currently translated at 50.1% (1306 of 2605)
2013-04-07 12:10:55 +02:00
J. M
629fc383dd Translated using Weblate (German)
Currently translated at 100.0% (2605 of 2605)
2013-04-07 12:10:53 +02:00
Jouni Kähkönen
3ddc4600f7 Translated using Weblate (Finnish)
Currently translated at 70.1% (1826 of 2605)
2013-04-07 12:10:51 +02:00
Michal Čihař
ffa7a33828 Merge branch 'QA_4_0' 2013-04-07 12:10:17 +02:00
Kasun Chathuranga
b310bd50fb Fix bug #3865 Using like operator on each backslash needs 4 backslash protection 2013-04-07 12:09:57 +02:00
Michal Čihař
bff52d3944 Merge pull request #231 from kasunchathuranga/Bug3865
Fix bug #3865 Using like operator on each backslash needs 4 backslash pr...
2013-04-07 03:09:11 -07:00
Weblate
13e126b092 Merge remote-tracking branch 'origin/master' 2013-04-07 12:08:27 +02:00
Yungu Kim
a6d17217b3 Translated using Weblate (Korean)
Currently translated at 50.1% (1306 of 2605)
2013-04-07 12:08:23 +02:00
J. M
1690d65640 Translated using Weblate (German)
Currently translated at 100.0% (2605 of 2605)
2013-04-07 12:08:20 +02:00
Jouni Kähkönen
d6856405b7 Translated using Weblate (Finnish)
Currently translated at 70.1% (1826 of 2605)
2013-04-07 12:08:04 +02:00
Michal Čihař
6c60e5d3d3 Merge pull request #233 from adamgsoc2013/master
add test case for PMA_Header_test
2013-04-07 03:07:38 -07:00
adamgsoc2013
b00f9935dc add test case for PMA_Header_test
1. add testGetJsParams
2. add testGetJsParamsCode
2013-04-06 18:29:52 +08:00
Kasun Chathuranga
22532c28a8 Fix bug #3865 Using like operator on each backslash needs 4 backslash protection 2013-04-06 07:14:51 +05:30
J. M
7af9fd7f42 Translated using Weblate (German)
Currently translated at 100.0% (2605 of 2605)
2013-04-05 14:00:39 +02:00
J. M
af7abd195a Translated using Weblate (German)
Currently translated at 100.0% (2605 of 2605)
2013-04-05 14:00:28 +02:00
Michal Čihař
5e88babbcb Merge remote-tracking branch 'origin/QA_4_0' 2013-04-05 12:57:29 +02:00
Michal Čihař
46e14926c6 Merge remote-tracking branch 'origin/QA_3_5' into QA_4_0 2013-04-05 12:56:22 +02:00
Burak Yavuz
86bf564a74 Translated using Weblate (Turkish)
Currently translated at 100.0% (2605 of 2605)
2013-04-05 12:54:48 +02:00
Michal Čihař
fa6055ec4b Translated using Weblate (Simplified Chinese)
Currently translated at 98.6% (2568 of 2605)
2013-04-05 12:54:48 +02:00
Rodrigo Souza
8c9e212251 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2605 of 2605)
2013-04-05 12:54:47 +02:00
LOL DJ
38ef107af3 Translated using Weblate (Italian)
Currently translated at 93.6% (2438 of 2605)
2013-04-05 12:54:46 +02:00
Giovanni Sora
419908bab2 Translated using Weblate (Interlingua)
Currently translated at 2.0% (51 of 2605)
2013-04-05 12:54:46 +02:00
Carsten Nielsen
0ce31337d0 Translated using Weblate (German)
Currently translated at 99.0% (2580 of 2605)
2013-04-05 12:54:45 +02:00
frandieguez
bd005dedb1 Translated using Weblate (Galician)
Currently translated at 99.3% (2587 of 2605)
2013-04-05 12:54:45 +02:00
Michal Čihař
80e0df5760 Translated using Weblate (Bosnian)
Currently translated at 18.4% (479 of 2605)
2013-04-05 12:54:44 +02:00
Burak Yavuz
0683c140d5 Translated using Weblate (Turkish)
Currently translated at 100.0% (2605 of 2605)
2013-04-05 12:54:32 +02:00
Michal Čihař
654b4d0b0e Translated using Weblate (Simplified Chinese)
Currently translated at 98.6% (2568 of 2605)
2013-04-05 12:54:32 +02:00
Rodrigo Souza
7b4a7be462 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2605 of 2605)
2013-04-05 12:54:32 +02:00