Commit Graph

81556 Commits

Author SHA1 Message Date
Marc Delisle
6bb080e331 Missing space in generated query 2013-02-14 07:43:32 -05:00
Michal Čihař
19f84f8b0d Translated using Weblate (English (United Kingdom))
Currently translated at 100.0% (2601 of 2601)
2013-02-14 10:34:34 +01:00
Marc Delisle
f7ee6976e3 Translated using Weblate (French)
Currently translated at 100.0% (2601 of 2601)
2013-02-13 16:11:24 +01:00
Weblate
18d5d9062e Merge remote-tracking branch 'origin/master' 2013-02-13 14:41:07 +01:00
Andrey Prokopenko
2f2bb1e529 Translated using Weblate (Ukrainian)
Currently translated at 91.4% (2379 of 2604)
2013-02-13 14:41:01 +01:00
Dieter Adriaenssens
dcf54f7f89 Update po files 2013-02-13 14:39:16 +01:00
Dieter Adriaenssens
49371bbb85 Better description 2013-02-13 14:38:06 +01:00
Michal Čihař
f9abb77686 Correctly test for PHP_OS detection 2013-02-13 09:27:05 +01:00
Michal Čihař
5230e6cbdd Add missing query to dummy driver
This is needed to run testsuite on Windows.
2013-02-13 09:23:13 +01:00
Marc Delisle
2acbba64b3 Fix merge conflict 2013-02-12 14:56:01 -05:00
Marc Delisle
c3a100fe10 Merge branch 'QA_3_5' 2013-02-12 14:55:29 -05:00
Marc Delisle
e8cb50db52 3.5.8-dev 2013-02-12 14:55:16 -05:00
Marc Delisle
1c97d33396 Merge branch 'MAINT_3_5_7' into QA_3_5 2013-02-12 14:54:01 -05:00
Marc Delisle
f0cb0e7dab 3.5.7-rc1 2013-02-12 14:53:05 -05:00
J.M
eb7b59b609 Merge branch 'QA_3_5' 2013-02-12 19:34:36 +01:00
J.M.
c5ad32e00d Merge pull request #167 from lem9/chrome_detection
Correct detection of the Chrome browser
2013-02-12 10:21:05 -08:00
Marc Delisle
5aad30f760 Correct detection of the Chrome browser 2013-02-12 12:53:58 -05:00
Michal Čihař
6c4aedbac2 Fix typo 2013-02-12 15:54:49 +01:00
Michal Čihař
9afa1f3690 Update po files 2013-02-12 15:53:00 +01:00
Michal Čihař
192ca5de47 Merge pull request #166 from helmo/master
Place some more variable names between curly braces
2013-02-12 06:48:21 -08:00
Herman van Rink
5b295a8916 Place some more variable names between curly braces 2013-02-12 15:00:02 +01:00
Michal Čihař
5e7e416dab Merge remote-tracking branch 'origin/QA_3_5'
Conflicts:
	libraries/header_http.inc.php
2013-02-12 14:15:12 +01:00
Michal Čihař
9702c92f82 Merge pull request #164 from lem9/bug_3821
Bug #3821 Safari: white page
2013-02-12 05:13:27 -08:00
Michal Čihař
d64daa0cdb Include some possibly missing variables 2013-02-12 14:09:06 +01:00
Marc Delisle
c758fdae2c No longer need to allow phpmyadmin.net 2013-02-12 08:06:53 -05:00
Marc Delisle
95e948fbfd Bug #3821 Safari: white page 2013-02-12 08:00:37 -05:00
Michal Čihař
8f159ee62c Merge remote-tracking branch 'origin/QA_3_5' 2013-02-12 10:09:32 +01:00
Michal Čihař
6836ec03dd Add link to developers section 2013-02-12 10:09:19 +01:00
Weblate
83f396164a Merge remote-tracking branch 'origin/master' 2013-02-12 10:06:56 +01:00
Kai-Ove Finvold
e22c6fdcff Translated using Weblate (Norwegian Bokmål)
Currently translated at 72.0% (1874 of 2602)
2013-02-12 10:06:00 +01:00
Edgaras Janušauskas
cccf972f04 Translated using Weblate (Lithuanian)
Currently translated at 67.8% (1764 of 2602)
2013-02-12 10:05:58 +01:00
Kai-Ove Finvold
a358df5c58 Translated using Weblate (Norwegian Bokmål)
Currently translated at 77.2% (1977 of 2562)
2013-02-12 10:05:45 +01:00
Edgaras Janušauskas
9e3d5a6c7d Translated using Weblate (Lithuanian)
Currently translated at 73.5% (1882 of 2562)
2013-02-12 10:05:43 +01:00
Atul Pratap Singh
cf200355a7 Fixing bug: 3798, correcting CHAR_LENGTH use, for blob in where clause 2013-02-12 11:14:42 +05:30
Michal Čihař
bf638ee837 Fix tests to use http urls as well 2013-02-11 08:53:54 +01:00
Weblate
b7d2f994ce Merge remote-tracking branch 'origin/master' 2013-02-11 08:49:21 +01:00
Michal Čihař
fe003c609c Merge remote-tracking branch 'origin/QA_3_5' 2013-02-11 08:48:58 +01:00
Andrey Prokopenko
aee739fc75 Translated using Weblate (Ukrainian)
Currently translated at 97.2% (2489 of 2562)
2013-02-11 08:47:56 +01:00
Weblate
28b47ffc8c Merge remote-tracking branch 'origin/master' 2013-02-11 08:42:58 +01:00
Andrey Prokopenko
2cfbe04dc5 Translated using Weblate (Ukrainian)
Currently translated at 90.6% (2357 of 2602)
2013-02-11 08:42:52 +01:00
Michal Čihař
c618ffffbb Merge git://github.com/helmo/phpmyadmin 2013-02-11 08:42:13 +01:00
Victor Volkov
a3ba7c87cf Translated using Weblate (Russian)
Currently translated at 100.0% (2602 of 2602)
2013-02-10 16:40:06 +01:00
Weblate
9ac7b0bedb Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2013-02-09 13:51:12 +01:00
Weblate
b1b93ed559 Merge remote-tracking branch 'origin/master' 2013-02-09 13:51:10 +01:00
Ewald Gemert, van
2eab182e9f Translated using Weblate (Dutch)
Currently translated at 100.0% (2562 of 2562)
2013-02-09 13:51:09 +01:00
Marc Delisle
bcfba0d46c Fix merge conflicts 2013-02-09 07:50:16 -05:00
Marc Delisle
4aa963ac87 Merge branch 'QA_3_5' 2013-02-09 07:46:16 -05:00
Marc Delisle
9b7f2180df Bug #3816 Missing server_processlist.php 2013-02-09 07:36:10 -05:00
Weblate
1cb22d9b28 Merge remote-tracking branch 'origin/master' 2013-02-09 12:44:31 +01:00
Ewald Gemert, van
0f29321d96 Translated using Weblate (Dutch)
Currently translated at 100.0% (2602 of 2602)
2013-02-09 12:44:25 +01:00