Commit Graph

84129 Commits

Author SHA1 Message Date
adamgsoc2013
23b9fe22c6 add test case for Export_Relation_Schema class 2013-06-12 00:00:48 +08:00
Weblate
a03a3594b4 Merge remote-tracking branch 'origin/master' 2013-06-11 16:28:45 +02:00
Peter Rosa
b7fb31557f Translated using Weblate (Slovak)
Currently translated at 79.2% (2112 of 2665)
2013-06-11 16:28:41 +02:00
Michal Čihař
22e0b6ac89 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-06-11 16:28:28 +02:00
Michal Čihař
34dce1d3b4 Various coding style improvements 2013-06-11 16:27:31 +02:00
Weblate
b27cf8a8fa Merge remote-tracking branch 'origin/master' 2013-06-11 16:08:57 +02:00
Peter Rosa
5e2ecc8dcc Translated using Weblate (Slovak)
Currently translated at 78.2% (2083 of 2665)
2013-06-11 16:08:53 +02:00
Michal Čihař
30428449bb swekey.php is also external lib 2013-06-11 16:08:42 +02:00
Weblate
96304c44e7 Merge remote-tracking branch 'origin/master' 2013-06-11 16:01:54 +02:00
Peter Rosa
4187d2b13a Translated using Weblate (Slovak)
Currently translated at 77.8% (2073 of 2665)
2013-06-11 16:01:27 +02:00
Michal Čihař
98f6f5b41f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-06-11 16:00:37 +02:00
Michal Čihař
3a7139db70 Use shorter notion of server array 2013-06-11 16:00:22 +02:00
Michal Čihař
dfb81b4b92 Coding style improvements 2013-06-11 15:59:23 +02:00
Michal Čihař
ccea46327e We do not want to scan captcha lib for errors 2013-06-11 15:55:46 +02:00
Weblate
b6fe46d41e Merge remote-tracking branch 'origin/master' 2013-06-11 15:45:34 +02:00
Peter Rosa
7e95695710 Translated using Weblate (Slovak)
Currently translated at 76.9% (2049 of 2665)
2013-06-11 15:45:30 +02:00
Michal Čihař
93caaaa129 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-06-11 15:45:14 +02:00
Michal Čihař
59820e4608 Skip test if can not connect to MySQL server 2013-06-11 15:45:00 +02:00
Weblate
f03d13ded7 Merge remote-tracking branch 'origin/master' 2013-06-11 15:36:02 +02:00
Peter Rosa
4d23b5f1f2 Translated using Weblate (Slovak)
Currently translated at 76.3% (2033 of 2665)
2013-06-11 15:35:58 +02:00
Michal Čihař
7c3a482049 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-06-11 15:35:11 +02:00
Michal Čihař
9e523947e5 Changelog entry 2013-06-11 15:34:33 +02:00
Michal Čihař
e9f7faa6d3 Add hint to captcha in security tips 2013-06-11 15:33:41 +02:00
Michal Čihař
5936f61486 Missing crossreferences in captcha doc (issue #369) 2013-06-11 15:31:43 +02:00
Michal Čihař
d08730780a Consistent config naming with other config options (issue #369) 2013-06-11 15:30:14 +02:00
Michal Čihař
65a083f6d4 Merge branch 'RECAPTCHA2' of git://github.com/pbojan/phpmyadmin into pbojan-RECAPTCHA2
Conflicts:
	libraries/Header.class.php
2013-06-11 15:28:19 +02:00
Michal Čihař
ba4e4f7eaf Add name for utf8mb4 2013-06-11 15:06:19 +02:00
Weblate
5e3793cb66 Merge remote-tracking branch 'origin/master' 2013-06-11 15:05:22 +02:00
Peter Rosa
4ccd55e0a7 Translated using Weblate (Slovak)
Currently translated at 74.9% (1996 of 2665)
2013-06-11 15:05:16 +02:00
Madhura Jayaratne
0f4e573b1e No longer need to manually restore GLOBALS 2013-06-11 18:34:47 +05:30
Peter Rosa
19de1a197b Translated using Weblate (Slovak)
Currently translated at 74.4% (1984 of 2665)
2013-06-11 14:59:35 +02:00
Weblate
ee10b29533 Merge remote-tracking branch 'origin/master' 2013-06-11 14:59:16 +02:00
Peter Rosa
8f151373fe Translated using Weblate (Slovak)
Currently translated at 74.4% (1984 of 2665)
2013-06-11 14:59:12 +02:00
Madhura Jayaratne
8564985a28 Translated using Weblate (Sinhala)
Currently translated at 81.5% (2172 of 2665)
2013-06-11 14:59:09 +02:00
Michal Čihař
db12503e17 Merge remote-tracking branch 'origin/QA_4_0' 2013-06-11 14:58:54 +02:00
Michal Čihař
999a898aa3 Merge commit '85e5a3b5cebf5a7479779297bfcb50294f3f8725' 2013-06-11 14:58:48 +02:00
Weblate
a0e86e92f1 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-06-11 14:58:24 +02:00
Peter Rosa
7d4a8fa3d2 Translated using Weblate (Slovak)
Currently translated at 78.3% (2038 of 2603)
2013-06-11 14:58:21 +02:00
Madhura Jayaratne
31f7230fa7 Translated using Weblate (Sinhala)
Currently translated at 81.7% (2127 of 2603)
2013-06-11 14:58:19 +02:00
Michal Čihař
85e5a3b5ce bug #3645 Better handling of invalid ODS documents 2013-06-11 14:58:02 +02:00
Weblate
4eefa080c7 Merge remote-tracking branch 'origin/master' 2013-06-11 14:43:58 +02:00
Peter Rosa
42c9796dc3 Translated using Weblate (Slovak)
Currently translated at 74.1% (1975 of 2665)
2013-06-11 14:43:54 +02:00
Madhura Jayaratne
d5c59b99d0 Translated using Weblate (Sinhala)
Currently translated at 79.4% (2115 of 2665)
2013-06-11 14:43:51 +02:00
Michal Čihař
20698d1c57 Fix test to work without preconfigured globals 2013-06-11 14:43:41 +02:00
Peter Rosa
4e3b9a7856 Translated using Weblate (Slovak)
Currently translated at 73.6% (1962 of 2665)
2013-06-11 14:37:53 +02:00
Weblate
0f8c79de00 Merge remote-tracking branch 'origin/master' 2013-06-11 14:37:37 +02:00
Peter Rosa
2c3cf1a434 Translated using Weblate (Slovak)
Currently translated at 73.7% (1963 of 2665)
2013-06-11 14:37:34 +02:00
Madhura Jayaratne
59fff74447 Translated using Weblate (Sinhala)
Currently translated at 79.2% (2110 of 2665)
2013-06-11 14:37:30 +02:00
Marc Delisle
d458b9913c Merge pull request #410 from xmujay/0609week_serverview
refactor server_collations.php 1. split long function 2. add server_common.lib.php
2013-06-11 05:37:21 -07:00
Weblate
e63a34fcab Merge remote-tracking branch 'origin/master' 2013-06-11 14:33:12 +02:00