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

82277 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
ddceaedca2 Merge branch 'QA_4_0' 
Conflicts:
	po/ko.po
	po/ms.po
	po/pt_BR.po
 2013-04-13 18:05:52 +05:30
Madhura Jayaratne
e3e1c05293 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-04-13 17:18:59 +05:30
Madhura Jayaratne
c833ec46fe Merge branch 'QA_4_0' 
Conflicts:
	po/ko.po
 2013-04-13 17:17:47 +05:30
Weblate
bb025f887d Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-04-13 13:44:55 +02:00
Rodrigo Souza
0873c69e16 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2605 of 2605)
 2013-04-13 13:44:53 +02:00
Ahmad Zulhilmi Idris
5fc4188b64 Translated using Weblate (Malay) 
Currently translated at 15.2% (396 of 2605)
 2013-04-13 13:44:52 +02:00
Yungu Kim
6de2c5490e Translated using Weblate (Korean) 
Currently translated at 55.5% (1447 of 2605)
 2013-04-13 13:44:50 +02:00
Madhura Jayaratne
14feb9ede5 Remove Osmarender layer as it is no longer maintained 2013-04-13 17:14:05 +05:30
Madhura Jayaratne
0862f0a1ee Allow loading map tiles when HTTPS is not used 2013-04-13 17:06:31 +05:30
Dong-bum Kim
cdca054e42 Translated using Weblate (Korean) 
Currently translated at 53.5% (1393 of 2605)
 2013-04-12 22:35:28 +02:00
Weblate
a73a2e4ec1 Merge remote-tracking branch 'origin/master' 2013-04-12 19:20:07 +02:00
Rodrigo Souza
85b5f1d52e Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2605 of 2605)
 2013-04-12 19:20:00 +02:00
Madhura Jayaratne
8b50d0771c Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-04-12 22:49:11 +05:30
Madhura Jayaratne
ea09916fe5 Wrap more long lines 2013-04-12 22:47:29 +05:30
Madhura Jayaratne
5233193a26 Wrap some long lines 2013-04-12 22:38:27 +05:30
Weblate
49b4a117f0 Merge remote-tracking branch 'origin/master' 2013-04-12 18:49:11 +02:00
Rodrigo Souza
ecce13b5f5 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2605 of 2605)
 2013-04-12 18:49:06 +02:00
Madhura Jayaratne
2007eb7ff7 Space after exclamation mark 2013-04-12 22:09:26 +05:30
Madhura Jayaratne
8ea9c0719e TRUE, FALSE and NULL must be lowercase 2013-04-12 22:00:54 +05:30
Madhura Jayaratne
1641845e94 Fix superfluous doc comments 2013-04-12 21:59:14 +05:30
Madhura Jayaratne
ae0125b013 Closing parenthesis of a multi-line IF statement must be on a new line 2013-04-12 21:54:03 +05:30
Madhura Jayaratne
466a7645c7 PHP keywords must be lowercase 2013-04-12 21:45:02 +05:30
Weblate
18ed0db238 Merge remote-tracking branch 'origin/master' 2013-04-12 16:03:36 +02:00
Ahmad Zulhilmi Idris
36ca6b1b19 Translated using Weblate (Malay) 
Currently translated at 15.2% (396 of 2605)
 2013-04-12 16:03:31 +02:00
Dong-bum Kim
658488845f Translated using Weblate (Korean) 
Currently translated at 53.5% (1393 of 2605)
 2013-04-12 16:03:23 +02:00
Dieter Adriaenssens
059812b5d7 Merge branch 'test_coverage' 2013-04-12 16:02:50 +02:00
Dieter Adriaenssens
43cce027a9 only generate code coverage for php files 2013-04-12 15:51:57 +02:00
Marc Delisle
f02a30c420 Merge branch 'QA_4_0' 2013-04-11 20:15:34 -04:00
Marc Delisle
182c269b34 Fix broken test 2013-04-11 20:15:24 -04:00
Marc Delisle
a51b3ea9b9 Fix broken test 2013-04-11 20:13:22 -04:00
Weblate
68d6618794 Merge remote-tracking branch 'origin/master' 2013-04-12 01:54:18 +02:00
Rodrigo Souza
2bf7ec7a6e Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2605 of 2605)
 2013-04-12 01:53:15 +02:00
Weblate
3869a3c765 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-04-12 01:53:12 +02:00
Rodrigo Souza
faa6e8c992 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2605 of 2605)
 2013-04-12 01:53:10 +02:00
Marc Delisle
85662ca4f7 Merge branch 'QA_4_0' 2013-04-11 19:51:02 -04:00
Marc Delisle
6a39a4445a bug #3871 Check referential integrity broken across databases 2013-04-11 19:50:48 -04:00
Marc Delisle
fb3b7541e3 Improve comment 2013-04-11 08:00:49 -04:00
Marc Delisle
e9caca2e6c Merge pull request #235 from xmujay/gsoc2013_4 
[Refactor] server_databases.php refactor:
 2013-04-11 04:46:23 -07:00
Michal Čihař
0aad375113 Merge pull request #240 from adamgsoc2013/UT1 
add test case for PMA_Header_test
 2013-04-11 02:20:55 -07:00
adamgsoc2013
078cd86256 add test case for PMA_Header_test 
1. testGetMessage
2. testSetBodyId
 2013-04-11 15:11:20 +08:00
Weblate
a3644979e4 Merge remote-tracking branch 'origin/master' 2013-04-11 08:42:13 +02:00
Rodrigo Souza
a34355963c Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2605 of 2605)
 2013-04-11 08:42:09 +02:00
Ahmad Zulhilmi Idris
22fd1858d3 Translated using Weblate (Malay) 
Currently translated at 13.8% (359 of 2605)
 2013-04-11 08:42:03 +02:00
Michal Čihař
b393c8cd12 Merge remote-tracking branch 'origin/QA_4_0' 2013-04-11 08:41:41 +02:00
Michal Čihař
6026442741 Merge commit '1a5793ca0a35ca504e0df45e7db93a3fee127988' 2013-04-11 08:41:28 +02:00
Weblate
caa487f852 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-04-11 08:40:54 +02:00
Rodrigo Souza
b6d98e2564 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2605 of 2605)
 2013-04-11 08:40:48 +02:00
Ahmad Zulhilmi Idris
8830deaefd Translated using Weblate (Malay) 
Currently translated at 13.8% (359 of 2605)
 2013-04-11 08:40:46 +02:00
Michal Čihař
1a5793ca0a Merge pull request #238 from kasunchathuranga/Bug3860 
Fix bug #3860 Displayed git revision info is not set
 2013-04-10 23:40:38 -07:00
xmujay
1871c90072 add $html definition 2013-04-11 09:49:17 +08:00