Commit Graph

88540 Commits

Author SHA1 Message Date
Dieter Adriaenssens
93643db0a7 Translated using Weblate (Dutch)
Currently translated at 100.0% (2749 of 2749)
2014-02-12 14:10:57 +01:00
Marc Delisle
0aea14ae1d ChangeLog entry for fix of bug #4275
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-02-11 12:51:42 -05:00
Marc Delisle
37dc085ef1 Merge pull request #916 from dhananjay92/Bug#4275
Fix for Bug#4275
2014-02-11 12:50:12 -05:00
Marc Delisle
bc32d0ccb6 Merge branch 'QA_4_1' of github.com:phpmyadmin/phpmyadmin into QA_4_1 2014-02-11 12:29:53 -05:00
Marc Delisle
fc36ed7322 ChangeLog entry for fix of bug #4249
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-02-11 12:29:37 -05:00
Weblate
7a5296bd43 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-02-11 18:28:38 +01:00
Anders Jonsson
fb8c1e3374 Translated using Weblate (Swedish)
Currently translated at 99.1% (2726 of 2749)
2014-02-11 18:28:36 +01:00
Porta Shqipe
b80a8b913b Translated using Weblate (Albanian)
Currently translated at 29.6% (814 of 2749)
2014-02-11 18:28:34 +01:00
Marc Delisle
b7da0fa50c Merge pull request #913 from sampathLiyanage/bugfix4249
bug fix 4249
2014-02-11 12:28:25 -05:00
Weblate
2b9ea28183 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-02-10 19:08:58 +01:00
Porta Shqipe
20de19c7c9 Translated using Weblate (Albanian)
Currently translated at 29.4% (810 of 2749)
2014-02-10 19:08:54 +01:00
Marc Delisle
7c68e0a633 ChangeLog entry for fix of bug #4276
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-02-10 13:08:44 -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
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
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
d0648cccf6 4.1.8-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-02-09 07:27:50 -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
52084d839c Fix for Bug#4275
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
2014-02-09 14:06:36 +05:30
Dhananjay Nakrani
9d66a521a1 Contest-5 Bug#4276.
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
2014-02-09 13:26:33 +05:30
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
Sampath Liyanage
b6cd8cdb33 bug fix 4249
Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
2014-02-08 22:24:03 +05:30
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
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
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
Oleksandr
b872ebf924 Translated using Weblate (Ukrainian)
Currently translated at 94.3% (2595 of 2749)
2014-02-08 00:44:12 +01:00
Yungu Kim
dc2ce8d4d7 Translated using Weblate (Korean)
Currently translated at 74.0% (2037 of 2749)
2014-02-07 18:44:05 +01:00
Jozef Pistej
1a0d553a18 Translated using Weblate (Slovak)
Currently translated at 80.2% (2205 of 2749)
2014-02-07 15:44:07 +01:00
Weblate
9ef1e5ce0f Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-02-05 14:05:28 +01:00
Atul Pratap Singh
109eb9e1f2 Fix bug#4274 index_div was being added twice
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-02-06 00:04:29 +05:30
Dieter
a404f7ef6c Translated using Weblate (Dutch)
Currently translated at 100.0% (2749 of 2749)
2014-02-05 14:05:25 +01:00
Aputsiaq Niels Janussen
bada6f24ac Translated using Weblate (Danish)
Currently translated at 99.8% (2746 of 2749)
2014-02-05 14:05:24 +01:00
Michal Čihař
968d5d5f48 Sanitize filename in import message
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-05 09:25:31 +01:00
Michal Čihař
addebbee8b Avoid code duplication
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-05 09:24:11 +01:00
Weblate
f5b7e36114 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-02-04 13:40:52 +01:00
Daniel Silva
f80caa8892 Translated using Weblate (Portuguese)
Currently translated at 61.2% (1683 of 2749)
2014-02-04 13:40:49 +01:00
Giovanni Sora
eb382da085 Translated using Weblate (Interlingua)
Currently translated at 40.7% (1119 of 2749)
2014-02-04 13:40:47 +01:00
Marc Delisle
22c997a9f3 ChangeLog entry for fix of bug #4270
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-02-04 07:39:06 -05:00
Marc Delisle
d92722ad05 Merge commit '90d5772' into QA_4_1 2014-02-04 07:37:43 -05:00