Commit Graph

87987 Commits

Author SHA1 Message Date
Marc Delisle
6da69db403 Merge commit '2a9fa2a' 2013-11-13 07:14:16 -05:00
Marc Delisle
9e8a9f8d5c Fix merge conflicts 2013-11-13 07:13:52 -05:00
Marc Delisle
dbed33bc25 ChangeLog entry for second part of fix for bug #4141 2013-11-13 07:10:33 -05:00
Weblate
2a9fa2a016 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-11-13 13:08:55 +01:00
Lakshmanan M
8ee7c68859 Translated using Weblate (Tamil)
Currently translated at 15.4% (404 of 2614)
2013-11-13 13:08:52 +01:00
Marc Delisle
f3cc65590d Merge pull request #753 from scnakandala/QA_4.0_Fixes
Bug Fix 4141
2013-11-13 04:08:30 -08:00
Spun Nakandala
cff55cd200 removed to fix bug 4141 2013-11-13 15:50:46 +05:30
Aputsiaq Niels Janussen
b95a339413 Translated using Weblate (Danish)
Currently translated at 100.0% (2740 of 2740)
2013-11-13 02:06:06 +01:00
Marc Delisle
7cca0800e4 Fix merge conflicts 2013-11-12 13:18:15 -05:00
Marc Delisle
a8b064c360 ChangeLog entry for fix of bug #3939 2013-11-12 13:01:54 -05:00
Serge Barth
a555959ed5 Bug #3939 PHP NavigationTree error when paging through list 2013-11-12 13:00:56 -05:00
Dieter Adriaenssens
1e64844537 Translated using Weblate (Dutch)
Currently translated at 100.0% (2740 of 2740)
2013-11-12 16:10:53 +01:00
Marc Delisle
1a0eff3a9c Fix typos 2013-11-12 07:16:20 -05:00
Marc Delisle
87c859e524 Merge pull request #750 from Tithugues/phpdoc
PHPDoc update
2013-11-12 04:13:18 -08:00
Marc Delisle
5aee1c8f64 Fix merge conflicts 2013-11-12 07:03:02 -05:00
Marc Delisle
c2cd69c12b Merge commit '35d6e76' 2013-11-12 06:57:50 -05:00
Marc Delisle
46f88bab6b ChangeLog entry for fix of bug 4141 (part 1) 2013-11-12 06:57:03 -05:00
Marc Delisle
dfda271576 Merge pull request #752 from scnakandala/QA_4.0_Fixes
Bug Fix 4141
2013-11-12 03:56:24 -08:00
Spun Nakandala
f5fc4e0ae8 removed to fix bug 4141 2013-11-12 01:20:43 +05:30
Marc Delisle
548d4f2b3c Fix coding style 2013-11-11 14:03:59 -05:00
Marc Delisle
5f5b49d27e Merge pull request #749 from Tithugues/fix-unitialized
Minor: Fix unitialized variables
2013-11-11 11:02:21 -08:00
Hugues Peccatte
7e1e6e5691 Add initialization of some variables and useless code. 2013-11-11 18:56:46 +01:00
Weblate
6f543a46a1 Merge remote-tracking branch 'origin/master' 2013-11-11 18:30:16 +01:00
Giovanni Sora
e1e2035983 Translated using Weblate (Interlingua)
Currently translated at 34.5% (948 of 2740)
2013-11-11 18:30:12 +01:00
Madhura Jayaratne
26249a17fe Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-11-11 22:58:46 +05:30
Hugues Peccatte
473d3cd4a2 PHPDoc update. 2013-11-11 18:12:46 +01:00
Hugues Peccatte
f062d67797 Update types in PHPDoc. 2013-11-11 16:43:55 +01:00
Hugues Peccatte
927ba37a76 Minor fix for uninitialized vars. 2013-11-11 16:19:12 +01:00
Kristjan Räts
af84abf4b9 Translated using Weblate (Estonian)
Currently translated at 100.0% (2740 of 2740)
2013-11-11 16:08:32 +01:00
Weblate
bcfc370b5e Merge remote-tracking branch 'origin/master' 2013-11-11 13:17:44 +01:00
Giovanni Sora
afcd11a16a Translated using Weblate (Interlingua)
Currently translated at 32.1% (880 of 2740)
2013-11-11 13:17:40 +01:00
Marc Delisle
e0d7c65ddd Fix coding style 2013-11-11 07:16:31 -05:00
Weblate
d636b2811b Merge remote-tracking branch 'origin/master' 2013-11-11 13:01:04 +01:00
Giovanni Sora
9e4a0a70a2 Translated using Weblate (Interlingua)
Currently translated at 31.7% (870 of 2740)
2013-11-11 13:00:59 +01:00
Marc Delisle
d02c8b94f6 Fix coding style 2013-11-11 06:59:33 -05:00
Michal Čihař
e6e81ef5c9 Merge pull request #748 from Tithugues/phpdoc
Huge PHPDoc update
2013-11-11 01:21:52 -08:00
Panagiotis Papazoglou
248921beee Translated using Weblate (Greek)
Currently translated at 100.0% (2740 of 2740)
2013-11-11 07:27:19 +01:00
Madhura Jayaratne
5bf243b8e6 Specify types 2013-11-11 07:14:37 +05:30
Domen
1edfb27b17 Translated using Weblate (Slovenian)
Currently translated at 100.0% (2740 of 2740)
2013-11-11 01:37:21 +01:00
Hugues Peccatte
464ec23ad8 Huge PHPDoc update. 2013-11-10 23:04:58 +01:00
Madhura Jayaratne
94491ea514 Set the type of the returned object 2013-11-11 00:28:06 +05:30
Weblate
90cc7f0dd6 Merge remote-tracking branch 'origin/master' 2013-11-10 18:02:04 +01:00
Burak Yavuz
9824b0dcd5 Translated using Weblate (Turkish)
Currently translated at 100.0% (2740 of 2740)
2013-11-10 18:01:59 +01:00
Madhura Jayaratne
064944a0b0 Fix indentation 2013-11-10 22:30:58 +05:30
Burak Yavuz
0d25ac9165 Translated using Weblate (Turkish)
Currently translated at 100.0% (2740 of 2740)
2013-11-10 17:13:28 +01:00
Matías Bellone
10b88e483a Translated using Weblate (Spanish)
Currently translated at 100.0% (2740 of 2740)
2013-11-10 16:24:26 +01:00
Helder Santana
023d621bd0 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2740 of 2740)
2013-11-10 16:16:55 +01:00
Marc Delisle
ca0ee1bd9d These are not real databases to set privileges on 2013-11-10 10:10:57 -05:00
Luis Esteves
35d6e768a1 Translated using Weblate (Portuguese)
Currently translated at 55.0% (1439 of 2614)
2013-11-10 15:22:03 +01:00
Marc Delisle
48a12943b3 Translated using Weblate (French)
Currently translated at 100.0% (2740 of 2740)
2013-11-10 15:02:14 +01:00