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

89769 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
a5c19649cd Merge commit 'a61933e' 2014-02-10 13:11:13 -05:00
Marc Delisle
f7f98bbce9 Merge commit '9d66a52' 2014-02-10 13:10:23 -05:00
Weblate
a61933eda5 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-02-10 19:07:12 +01:00
Anders Jonsson
c61b875e33 Translated using Weblate (Swedish) 
Currently translated at 98.9% (2719 of 2749)
 2014-02-10 19:07:09 +01:00
Jozef Pistej
1122438394 Translated using Weblate (Slovak) 
Currently translated at 81.6% (2245 of 2749)
 2014-02-10 19:07:06 +01:00
renwar kurd
11310a01b8 Translated using Weblate (Kurdish Sorani) 
Currently translated at 19.6% (540 of 2749)
 2014-02-10 19:07:03 +01:00
Giovanni Sora
fa70f40a63 Translated using Weblate (Interlingua) 
Currently translated at 40.8% (1124 of 2749)
 2014-02-10 19:07:01 +01:00
Porta Shqipe
aa4a604754 Translated using Weblate (Albanian) 
Currently translated at 29.4% (809 of 2749)
 2014-02-10 19:06:59 +01:00
Marc Delisle
a40769271d Merge pull request #915 from dhananjay92/Contest-5-Bugs#4276 
Contest-5 Bug#4276.
 2014-02-10 13:06:50 -05:00
Weblate
35aec675a7 Merge remote-tracking branch 'origin/master' 2014-02-10 12:43:32 +01:00
Anders Jonsson
9bb6f1560d Translated using Weblate (Swedish) 
Currently translated at 98.1% (2690 of 2741)
 2014-02-10 12:43:29 +01:00
Jozef Pistej
6aac6db814 Translated using Weblate (Slovak) 
Currently translated at 74.5% (2043 of 2741)
 2014-02-10 12:43:27 +01:00
renwar kurd
0f4ea39bd7 Translated using Weblate (Kurdish Sorani) 
Currently translated at 18.1% (497 of 2741)
 2014-02-10 12:43:25 +01:00
Porta Shqipe
a00eda3577 Translated using Weblate (Albanian) 
Currently translated at 28.0% (768 of 2741)
 2014-02-10 12:43:23 +01:00
Marc Delisle
33c9582a53 Merge pull request #911 from WhaleWatching/fix_input_style 
pmahomme input and select style fix
 2014-02-10 06:43:17 -05:00
Kristjan Rรคts
ee53cc0ea0 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2741 of 2741)
 2014-02-09 15:42:42 +01:00
Weblate
d6822ad87e Merge remote-tracking branch 'origin/master' 2014-02-09 13:34:15 +01:00
Porta Shqipe
8ffe55b0da Translated using Weblate (Albanian) 
Currently translated at 27.3% (749 of 2741)
 2014-02-09 13:34:12 +01:00
Marc Delisle
ae8e4c13cb Merge commit 'e5c0a77' 2014-02-09 07:33:03 -05: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
e5c0a77c30 Merge branch 'QA_4_1' of https://github.com/phpmyadmin/phpmyadmin into QA_4_1 2014-02-09 07:31:56 -05:00
Marc Delisle
92d6282366 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-09 07:31:40 -05:00
Marc Delisle
741ae47340 4.1.8-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-09 07:31:09 -05:00
Weblate
f5c72ed941 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-02-09 13:28:52 +01:00
Porta Shqipe
88fdb17957 Translated using Weblate (Albanian) 
Currently translated at 28.3% (780 of 2749)
 2014-02-09 13:28:49 +01: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
Dhananjay Nakrani
9d66a521a1 Contest-5 Bug#4276. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-02-09 13:26:33 +05:30
Edward Cheng
ca32c689ec pmahomme input and select style fix 
I'm sorry the code i provided before is not perfect,
now new commit will separate  hover and focus effects.

Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-02-09 13:17:46 +08: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