gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,152 Commits 12 Branches 481 Tags 2.4 GiB
f4736d054e
Commit Graph

84152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
f4736d054e Use ant for travis ci builds 
This allows us to share setup with jenkins
 2013-06-12 10:46:38 +02:00
Michal Čihař
23141a05bd Add PHP lint to build.xml 2013-06-12 10:46:38 +02:00
Kristjan Räts
e7069f86f8 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2673 of 2673)
 2013-06-12 10:03:17 +02:00
Michal Čihař
c987f2bcaa Update po files 2013-06-12 09:39:39 +02:00
Weblate
f7edd8564a Merge remote-tracking branch 'origin/master' 2013-06-12 09:38:28 +02:00
Michal Čihař
be47052c37 Translated using Weblate (Czech) 
Currently translated at 99.9% (2673 of 2675)
 2013-06-12 09:38:22 +02:00
Michal Čihař
fab879f924 Simplify reCaptcha configuration 
Once private and public keys are in place, it is enabled. I see no need
for per server setup.
 2013-06-12 09:38:10 +02:00
Panagiotis Papazoglou
c64438fbe7 Translated using Weblate (Greek) 
Currently translated at 100.0% (2675 of 2675)
 2013-06-12 09:36:20 +02:00
Atul Pratap Singh
da4bd45136 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-06-12 12:55:25 +05:30
Michal Čihař
31cdfdaf69 Update po files 2013-06-12 09:08:17 +02:00
Michal Čihař
fc494c245b Merge pull request #413 from adamgsoc2013/UT_transform 
add test for transformation class: Text_Plain_Append
 2013-06-12 00:05:19 -07:00
Atul Pratap Singh
63b913708a Fix bug#3922, user privileges-database name unescaped 2013-06-12 12:33:52 +05:30
Michal Čihař
b77f50e610 Do not use "Save" label on setup/preferences forms 
It is confusing as it looks like the configuration is actually saved,
but it's not the case. I believe "Apply" is more appropriate here.
 2013-06-12 08:54:56 +02:00
Michal Čihař
1f7936c9c9 Merge pull request #414 from kasunchathuranga/CodingStyleImprovements 
Coding style improvements
 2013-06-11 12:16:14 -07:00
Kasun Chathuranga
0eb45c7a60 Add missing package names, align comments 2013-06-11 22:02:07 +05:30
Kasun Chathuranga
c5d9d66f22 Remove unnecessary @param tags 2013-06-11 21:58:50 +05:30
Kasun Chathuranga
3ccfc6fe88 Fix indentation 2013-06-11 21:55:56 +05:30
Kasun Chathuranga
479d2c1847 Fix alignment of doc comments 2013-06-11 21:54:34 +05:30
adamgsoc2013
95f29b01c7 testing Text_Plain_Append::getInfo() instead of Text_Plain_Append_getInfo() 2013-06-12 00:20:12 +08:00
Weblate
f7946633ec Merge remote-tracking branch 'origin/master' 2013-06-11 18:12:04 +02:00
Peter Rosa
d345cbafa5 Translated using Weblate (Slovak) 
Currently translated at 79.7% (2124 of 2665)
 2013-06-11 18:11:59 +02:00
Michal Čihař
f9e8acd5a0 Merge pull request #411 from adamgsoc2013/UT_schema 
add test case for Export_Relation_Schema class
 2013-06-11 09:11:50 -07:00
adamgsoc2013
7c07bb3b24 add test for transformation class: Text_Plain_Append 2013-06-12 00:08:33 +08:00
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