Commit Graph

84101 Commits

Author SHA1 Message Date
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
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
Peter Rosa
90f1da0e02 Translated using Weblate (Slovak)
Currently translated at 73.4% (1956 of 2665)
2013-06-11 14:33:08 +02:00
Madhura Jayaratne
b86f4b0e20 Translated using Weblate (Sinhala)
Currently translated at 78.9% (2104 of 2665)
2013-06-11 14:33:04 +02:00
Madhura Jayaratne
a378df7344 Translated using Weblate (Sinhala)
Currently translated at 78.9% (2104 of 2665)
2013-06-11 14:32:59 +02:00
Madhura Jayaratne
3aaa58bfe7 Translated using Weblate (Sinhala)
Currently translated at 78.9% (2104 of 2665)
2013-06-11 14:32:55 +02:00
Madhura Jayaratne
41783a1379 Translated using Weblate (Sinhala)
Currently translated at 78.9% (2104 of 2665)
2013-06-11 14:32:52 +02:00
Peter Rosa
5b6acf8630 Translated using Weblate (Slovak)
Currently translated at 73.4% (1955 of 2665)
2013-06-11 14:32:48 +02:00
Madhura Jayaratne
4299eed61c Translated using Weblate (Sinhala)
Currently translated at 78.9% (2103 of 2665)
2013-06-11 14:32:45 +02:00
Michal Čihař
ae2c8d5dfc Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-06-11 14:32:31 +02:00
Michal Čihař
fad06584f5 Enable backupGlobals directive in phpunit 2013-06-11 14:31:38 +02:00
Michal Čihař
2417937179 Define another query used in testsuite 2013-06-11 14:31:04 +02:00
Michal Čihař
1cff9b7229 Missing include 2013-06-11 14:28:38 +02:00
Michal Čihař
158389ea3e Make parser test work with error reporting as well 2013-06-11 14:28:28 +02:00
Michal Čihař
83712de59a Do not rely on previous globals 2013-06-11 14:18:32 +02:00
Michal Čihař
498b7a7012 Nedd to have defined ajax flag for most of the tets as well 2013-06-11 14:17:08 +02:00
Michal Čihař
4b787d4505 Do not rely too much on previous state 2013-06-11 14:16:17 +02:00
Michal Čihař
eb77c27e8d Make it work with separated globals 2013-06-11 14:12:55 +02:00
Michal Čihař
e463da3285 Possibly undefined variable 2013-06-11 14:08:14 +02:00
Michal Čihař
8b9fa8aa36 Do not set language in every test 2013-06-11 14:02:49 +02:00
Michal Čihař
a1b6d4bb4c Use correctly set language 2013-06-11 14:00:57 +02:00
Michal Čihař
bb922686e0 Globally set language 2013-06-11 14:00:44 +02:00
Michal Čihař
262d1b1a11 Allow to run standalone 2013-06-11 13:59:23 +02:00
Michal Čihař
e11113f5a9 Adjust to new token value 2013-06-11 13:56:51 +02:00
Michal Čihař
ba9cff2736 Set token in single place for all tests 2013-06-11 13:53:31 +02:00
Michal Čihař
f211f63327 Allow test to run standalone 2013-06-11 13:50:09 +02:00
Michal Čihař
c818cc69cf Allow test to run standalone 2013-06-11 13:48:50 +02:00
Weblate
dd0f5aafb7 Merge remote-tracking branch 'origin/master' 2013-06-11 13:38:46 +02:00
Peter Rosa
5995b1e70a Translated using Weblate (Slovak)
Currently translated at 72.5% (1933 of 2665)
2013-06-11 13:38:43 +02:00
Madhura Jayaratne
31d448e7e6 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-06-11 17:08:05 +05:30