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

88520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Viduranga Wijesooriya
90d57722ec fixed #4270 Bad text-color for table comments 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
 2014-02-04 16:26:25 +05:30
Weblate
e1c66824f8 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-02-04 08:07:47 +01:00
Praveen Illa
9172e2d328 Translated using Weblate (Telugu) 
Currently translated at 12.2% (336 of 2749)
 2014-02-04 08:07:45 +01:00
Matías Bellone
8c4867dea5 Translated using Weblate (Spanish) 
Currently translated at 100.0% (2749 of 2749)
 2014-02-04 08:07:42 +01:00
Michal Čihař
8219b4cc9c Merge pull request #887 from nijel/remove-flashcanvas 
Drop flashcanvas
 2014-02-03 23:07:40 -08:00
Michal Čihař
519bd943d8 Translated using Weblate (Spanish) 
Currently translated at 100.0% (2749 of 2749)
 2014-02-04 00:07:51 +01:00
Marc Delisle
c406599995 Revert "Avoid using hard-coded argument separator, see https://sourceforge.net/p/phpmyadmin/bugs/3733" 
This reverts commit 36e544ce9e.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-03 10:10:53 -05:00
Weblate
28e64b9258 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-02-03 14:42:59 +01:00
Ann + J.M
71a1c4d301 Translated using Weblate (German) 
Currently translated at 100.0% (2749 of 2749)
 2014-02-03 14:42:57 +01:00
Marc Delisle
36e544ce9e Avoid using hard-coded argument separator, see https://sourceforge.net/p/phpmyadmin/bugs/3733 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-03 08:42:39 -05: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
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
Michal Čihař
6f076b34e5 Drop flashcanvas 
Let's drop flashcanvas, which we use for rendering charts with MSIE 8
and older. I've tested it a bit and in none of the uses it works
properly, so it really does not work as a drop in replacement for native
browser support and it would probably need some adjustment in our code.

Also it is problematic from licensing point of view as we do not ship
source for it js/canvg/flashcanvas.swf.

Signed-off-by: Michal Čihař <mcihar@suse.cz>
 2014-02-03 13:32:01 +01:00
Michal Čihař
f5b8267ed0 Remove string at the end of file 2014-02-03 09:24:10 +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
Weblate
62d8a7864f Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-02-03 01:37:24 +01:00