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

89745 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Porta Shqipe
8ffe55b0da Translated using Weblate (Albanian) 
Currently translated at 27.3% (749 of 2741)
 2014-02-09 13:34:12 +01:00
Weblate
19a73e58fe Merge remote-tracking branch 'origin/master' 2014-02-09 13:32:43 +01:00
Porta Shqipe
044cc16f13 Translated using Weblate (Albanian) 
Currently translated at 27.2% (746 of 2741)
 2014-02-09 13:32:39 +01:00
Marc Delisle
741ae47340 4.1.8-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-09 07:31:09 -05:00
Marc Delisle
5e679196bb Merge commit 'd0648cc' 2014-02-09 07:28:36 -05:00
Marc Delisle
d0648cccf6 4.1.8-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-09 07:27:50 -05:00
Marc Delisle
5c213ec889 Merge branch 'QA_4_1' 2014-02-09 07:14:00 -05:00
Marc Delisle
e8c1b42374 Merge commit 'a3504f4' 2014-02-09 07:13:52 -05:00
Marc Delisle
4fc9aed582 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-09 07:13:36 -05:00
Marc Delisle
b9197e1dfd ChangeLog entry for fix of bug #4242 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-09 07:10:17 -05:00
Marc Delisle
a3504f4185 Merge pull request #904 from Vasu014/bug4242 
Fix For Wildcard-containing only_db failure in sidebar
 2014-02-09 07:08:57 -05:00
Marc Delisle
f60b0c92d0 Merge branch 'QA_4_1' 2014-02-08 19:51:13 -05:00
Marc Delisle
d32e6af2ab ChangeLog entry for bug #4271 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-08 19:49:34 -05:00
minhaz
afa4c8897e bug fix 4271 
Signed-off-by: A V Minhaz <minhazav@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-08 19:47:11 -05:00
Vasu Bhardwaj
45b538b1ec Fix For Wildcard-containing only_db failure in sidebar 
This commit fixes the Bug #4242. The "only_db"directive  now accepts
MySQL LIKE wildcards without errors.Changes have been made to the
function getData() in phpmyadmin/libraries/navigation/Nodes/Node.class.php .
The if-else clause has been removed. The checking of the "only_db"
directive is now performed solely by the function
getWhereClause()in the same class.

Signed-off-by: Vasu Bhardwaj <voodoorapter014@gmail.com>
 2014-02-08 21:54:18 +05:30
Marc Delisle
4907274e84 Merge branch 'QA_4_1' 2014-02-08 10:40:49 -05:00
Marc Delisle
32e217993e Merge commit '65a56a8' 2014-02-08 10:40:36 -05:00
Marc Delisle
4ef0354036 Merge commit '1156b57' 2014-02-08 10:39:48 -05:00
Marc Delisle
7a53b2a207 ChangeLog entry for fix of bug #4272 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-08 10:38:54 -05:00
Marc Delisle
65a56a8eb2 Merge pull request #902 from vpowerrc/bug-#4272 
#4272 Contest-4
 2014-02-08 10:38:44 -05:00
Viduranga Wijesooriya
1156b575a9 #4272 Contest-4 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
 2014-02-08 20:38:06 +05:30
Chanaka Indrajith
0cc71660b0 Rearange the order of export sql related user preferences 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-02-08 17:25:36 +05:30
Madhura Jayaratne
7eae60f326 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-02-08 13:09:54 +05:30
Madhura Jayaratne
f65ac8803e Merge branch 'QA_4_1' 2014-02-08 13:06:10 +05:30
Madhura Jayaratne
59e3c9474a bug #4278 reCaptcha re-login requires double effort 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-02-08 13:04:32 +05:30
Weblate
1b25c79d2a Merge remote-tracking branch 'origin/master' 2014-02-08 08:09:29 +01:00
Burak Yavuz
9675a20aa1 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2741 of 2741)
 2014-02-08 08:09:26 +01:00
Madhura Jayaratne
61338c4859 Remove trailing whitespaces 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-02-08 12:38:37 +05:30
Madhura Jayaratne
09dec45ffa Remove commented debugging code. Replace tabs with spaces 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-02-08 12:36:08 +05:30
Matรญas Bellone
6d0f976fd2 Translated using Weblate (Spanish) 
Currently translated at 100.0% (2741 of 2741)
 2014-02-08 00:51:53 +01:00
Oleksandr
b872ebf924 Translated using Weblate (Ukrainian) 
Currently translated at 94.3% (2595 of 2749)
 2014-02-08 00:44:12 +01:00
Domen
fb9362f471 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2741 of 2741)
 2014-02-07 23:36:11 +01:00
Panagiotis Papazoglou
74ff282943 Translated using Weblate (Greek) 
Currently translated at 100.0% (2741 of 2741)
 2014-02-07 22:15:58 +01:00
Marc Delisle
00d1529658 Translated using Weblate (French) 
Currently translated at 100.0% (2741 of 2741)
 2014-02-07 19:19:13 +01:00
Burak Yavuz
f13ffe57e6 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2741 of 2741)
 2014-02-07 18:59:22 +01:00
Marc Delisle
a66e06c675 Update po files 2014-02-07 12:50:49 -05:00
Marc Delisle
5c5673f4cf Fix coding style; add localization 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-07 12:49:57 -05:00
Marc Delisle
0034680de8 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-07 12:45:24 -05:00
Yungu Kim
dc2ce8d4d7 Translated using Weblate (Korean) 
Currently translated at 74.0% (2037 of 2749)
 2014-02-07 18:44:05 +01:00
Marc Delisle
1352cbea4d ChangeLog entry for fix of bug #4237 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-07 12:40:02 -05:00
Marc Delisle
e8f14e0ac0 Merge pull request #897 from dhananjay92/bug#4237 
Fix for bug#4237.
 2014-02-07 12:37:33 -05:00
Jozef Pistej
1a0d553a18 Translated using Weblate (Slovak) 
Currently translated at 80.2% (2205 of 2749)
 2014-02-07 15:44:07 +01:00
Domen
ee6402d914 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2740 of 2740)
 2014-02-07 15:09:46 +01:00
Weblate
cfe9c2ed24 Merge remote-tracking branch 'origin/master' 2014-02-07 13:58:01 +01:00
Dieter Adriaenssens
d34ad17635 Translated using Weblate (Dutch) 
Currently translated at 97.7% (2679 of 2740)
 2014-02-07 13:57:58 +01:00
Marc Delisle
cd998a4c62 Merge pull request #892 from Chanaka/rfe-1403 
rfe-1403 : Support for export only triggers/stored procedures
 2014-02-07 07:57:48 -05:00
Dhananjay
0a18d86059 Fix for bug#4237. 
Signed-off-by: Dhananjay <dhananjaynakrani@gmail.com>
 2014-02-07 11:56:46 +05:30
Chanaka Indrajith
4457f40ef4 Support for export server/db/table without views 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-02-06 23:03:04 +05:30
Weblate
723bd668b6 Merge remote-tracking branch 'origin/master' 2014-02-06 12:28:59 +01:00
Oleksandr
14894bb909 Translated using Weblate (Ukrainian) 
Currently translated at 86.0% (2357 of 2740)
 2014-02-06 12:28:57 +01:00