gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,589 Commits 12 Branches 481 Tags 2.4 GiB
837e8d8afc
Commit Graph

89589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
837e8d8afc Merge commit 'f966a0c' 2014-02-03 08:44:28 -05:00
Marc Delisle
31076f46e8 Merge commit 'c576f93' 2014-02-03 08:44:08 -05:00
Weblate
cc92f25bc1 Merge remote-tracking branch 'origin/master' 2014-02-03 14:19:40 +01:00
Madhura Jayaratne
6083ae2934 Translated using Weblate (Sinhala) 
Currently translated at 75.3% (2064 of 2740)
 2014-02-03 14:19:38 +01:00
Helder Santana
85ce10e904 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.8% (2516 of 2740)
 2014-02-03 14:19:35 +01:00
Kristjan Räts
6b2770b0e7 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2740 of 2740)
 2014-02-03 14:19:33 +01:00
Weblate
f966a0c651 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-02-03 14:19:32 +01:00
Madhura Jayaratne
71e7696325 Translated using Weblate (Sinhala) 
Currently translated at 78.3% (2154 of 2749)
 2014-02-03 14:19:30 +01:00
Ann + J.M
0d36525e3c Fix bug 4269 Notice on table relation page 2014-02-03 14:19:21 +01:00
Ann + J.M
c576f93180 Fix bug 4269 Notice on table relation page 2014-02-03 14:19:12 +01:00
Ann + J.M
7b552ced04 ChangeLog entry for bug #4269 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-02-03 14:17:23 +01:00
Ann + J.M
ec1943b0ed tbl_relation.php: check if $existrel_foreign is defined before using it 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-02-03 14:16:54 +01:00
Kristjan Räts
64bf48b0b7 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2740 of 2740)
 2014-02-03 13:51:27 +01:00
Panagiotis Papazoglou
80fcf0cceb Translated using Weblate (Greek) 
Currently translated at 100.0% (2740 of 2740)
 2014-02-03 13:48:45 +01:00
Michal Čihař
2af4ed5400 Translated using Weblate (Czech) 
Currently translated at 100.0% (2740 of 2740)
 2014-02-03 13:47:20 +01:00
Panagiotis Papazoglou
ad7c822d90 Translated using Weblate (Greek) 
Currently translated at 100.0% (2738 of 2738)
 2014-02-03 13:47:00 +01:00
Weblate
cc01d39e4d Merge remote-tracking branch 'origin/master' 2014-02-03 13:34:32 +01:00
Kristjan Räts
8566f52387 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2738 of 2738)
 2014-02-03 13:34:29 +01:00
Dieter Adriaenssens
0653592077 Update po files 2014-02-03 13:33:46 +01:00
Dieter Adriaenssens
1c582e4cb9 improve users/user groups table description 2014-02-03 13:32:57 +01:00
Kristjan Räts
f92e5cadbb Translated using Weblate (Estonian) 
Currently translated at 100.0% (2738 of 2738)
 2014-02-03 10:04:10 +01:00
Michal Čihař
2caa9aac7b Merge remote-tracking branch 'origin/QA_4_1' 
Conflicts:
	libraries/DisplayResults.class.php
 2014-02-03 09:25:00 +01:00
Michal Čihař
f5b8267ed0 Remove string at the end of file 2014-02-03 09:24:10 +01:00
Michal Čihař
396991a194 Merge remote-tracking branch 'origin/QA_4_1' 2014-02-03 09:01:55 +01:00
Michal Čihař
87bbb24496 Fix tescase for new parameter passed to recaptcha 
Signed-off-by: Michal Čihař <mcihar@suse.cz>
 2014-02-03 09:00:31 +01:00
Michal Čihař
c6969bfb9e Properly encode & in URL 
Signed-off-by: Michal Čihař <mcihar@suse.cz>
 2014-02-03 09:00:05 +01:00
Michal Čihař
e46193e88f Merge remote-tracking branch 'origin/QA_4_1' 2014-02-03 08:55:48 +01:00
Weblate
fc4f5d4e07 Merge remote-tracking branch 'origin/master' 2014-02-03 01:41:44 +01:00
Madhura Jayaratne
ddc7024245 Translated using Weblate (Sinhala) 
Currently translated at 74.4% (2039 of 2737)
 2014-02-03 01:41:41 +01:00
Madhura Jayaratne
94c3be7f39 Merge branch 'QA_4_1' 
Conflicts:
	export.php
 2014-02-03 06:11:14 +05:30
Weblate
62d8a7864f Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-02-03 01:37:24 +01:00
Madhura Jayaratne
32fd996988 Translated using Weblate (Sinhala) 
Currently translated at 78.2% (2150 of 2749)
 2014-02-03 01:37:21 +01:00
Madhura Jayaratne
ceecaa41c1 bug #4263 Japanese character encoding not working properly when exporting 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-02-03 06:06:19 +05:30
Panagiotis Papazoglou
2ca43acf8c Translated using Weblate (Greek) 
Currently translated at 100.0% (2738 of 2738)
 2014-02-02 21:50:00 +01:00
Domen
6d26682300 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2738 of 2738)
 2014-02-02 18:58:48 +01:00
Madhura Jayaratne
a5c6f555f9 Merge branch 'QA_4_1' 2014-02-02 22:56:55 +05:30
Madhura Jayaratne
4bf96e8e28 Merge branch 'QA_4_1' of github.com:phpmyadmin/phpmyadmin into QA_4_1 2014-02-02 22:54:17 +05:30
Madhura Jayaratne
22c851d1b8 bug #4259 reCaptcha sound session expired problem 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-02-02 22:53:11 +05:30
Madhura Jayaratne
a0ebe81f42 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-02-02 22:37:49 +05:30
Madhura Jayaratne
fc34716720 reCaptcha theme 'while' matches better with PMA themes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-02-02 22:22:53 +05:30
Weblate
466035d317 Merge remote-tracking branch 'origin/master' 2014-02-02 17:49:57 +01:00
Michal Čihař
2ecb74f499 Translated using Weblate (Welsh) 
Currently translated at 22.7% (624 of 2740)
 2014-02-02 17:49:54 +01:00
Michal Čihař
be1cc6b4a6 Translated using Weblate (Uzbek) 
Currently translated at 41.8% (1148 of 2740)
 2014-02-02 17:49:51 +01:00
Michal Čihař
32503e7fbe Translated using Weblate (Slovenian) 
Currently translated at 97.6% (2674 of 2738)
 2014-02-02 17:49:49 +01:00
Michal Čihař
331d080f8e Translated using Weblate (Serbian (latin)) 
Currently translated at 57.8% (1585 of 2740)
 2014-02-02 17:49:46 +01:00
Michal Čihař
f3dcaf9649 Translated using Weblate (Romanian) 
Currently translated at 53.0% (1451 of 2737)
 2014-02-02 17:49:44 +01:00
Michal Čihař
32ebb17357 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 59.3% (1625 of 2739)
 2014-02-02 17:49:42 +01:00
Michal Čihař
cefd33f21f Translated using Weblate (Japanese) 
Currently translated at 80.3% (2201 of 2740)
 2014-02-02 17:49:39 +01:00
Michal Čihař
14b28eaf69 Translated using Weblate (Italian) 
Currently translated at 81.3% (2226 of 2737)
 2014-02-02 17:49:37 +01:00
Michal Čihař
bfb4d67352 Translated using Weblate (Finnish) 
Currently translated at 63.3% (1736 of 2740)
 2014-02-02 17:49:36 +01:00