Commit Graph

82251 Commits

Author SHA1 Message Date
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
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
Kasun Chathuranga
57e751ff96 Add comments describing the changes 2013-04-11 06:50:16 +05:30
Weblate
7b4fa2c1c5 Merge remote-tracking branch 'origin/master' 2013-04-10 23:04:46 +02:00
Rodrigo Souza
06ed988504 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2605 of 2605)
2013-04-10 23:04:40 +02:00
Marc Delisle
c33285daf2 Merge pull request #236 from xmujay/gsoc2013_6
[Refactor] function PMA_PMA_sqlQueryForm refactor:
2013-04-10 14:04:27 -07:00
Kasun Chathuranga
224100dd8a Add ChangeLog entry for the bug fix 2013-04-11 00:15:35 +05:30
Kasun Chathuranga
2876b7014e Fix bug #3860 Displayed git revision info is not set 2013-04-10 23:59:33 +05:30
Weblate
d11ee258c4 Merge remote-tracking branch 'origin/master' 2013-04-10 19:15:19 +02:00
Rodrigo Souza
c5d344c58e Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2605 of 2605)
2013-04-10 19:15:13 +02:00
Marc Delisle
08617c3eb2 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-04-10 13:14:58 -04:00
Marc Delisle
8693167ea5 Improve readability 2013-04-10 13:14:44 -04:00
Weblate
bc97929725 Merge remote-tracking branch 'origin/master' 2013-04-10 19:08:01 +02:00
Rodrigo Souza
9347f8435f Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2605 of 2605)
2013-04-10 19:07:54 +02:00
Marc Delisle
9ac01bfc1e Merge pull request #234 from xmujay/gsoc2013_3
[Refactor] function PMA_sqlQueryFormInsert refactor:
2013-04-10 10:07:39 -07:00
xmujay
c2685a8b33 fix some indention 2013-04-10 23:32:46 +08:00
xmujay
42fcc5f6f6 merge with $html="" with php statements below 2013-04-10 23:07:02 +08:00
xmujay
1fa8851468 [Refactor] function PMA_PMA_sqlQueryForm refactor:
0.split long lines
1 render the HTML element at once
2013-04-10 22:50:45 +08:00
xmujay
7c86aab8f9 [Refactor] server_databases.php refactor:
0.split long lines
1 render the HTML element at once
2 fix code indention
3 use $html for readability
2013-04-10 22:31:18 +08:00
xmujay
e431b2944b function PMA_sqlQueryFormInsert refactor:
0.split long lines
1 render the HTML element at once
2 fix HTML and PHP mixture
3 fix code indention
4 use $html for readability
2013-04-10 22:06:58 +08:00
Michal Čihař
2d61296d90 Merge remote-tracking branch 'origin/QA_4_0' 2013-04-10 12:24:47 +02:00
Michal Čihař
3600a5e701 Revert "Count real number of shown databases"
This reverts commit bb317b2fc1.

This forces fetching of all databases again, but we need complete count
(see bug #3870).
2013-04-10 12:23:27 +02:00
Michal Čihař
b46210871e Merge remote-tracking branch 'origin/QA_4_0' 2013-04-10 10:13:22 +02:00
Michal Čihař
bd830cdc4e Merge remote-tracking branch 'origin/QA_3_5' into QA_4_0 2013-04-10 10:12:09 +02:00
likyh
52b4138702 Translated using Weblate (Simplified Chinese)
Currently translated at 99.6% (2594 of 2605)
2013-04-10 10:11:20 +02:00
Rodrigo Souza
c381ecbca5 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2605 of 2605)
2013-04-10 10:11:20 +02:00
Jakub Stepniak
af7ac3e7ad Translated using Weblate (Polish)
Currently translated at 99.7% (2597 of 2605)
2013-04-10 10:11:20 +02:00