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

98794 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
d230d78bb2 Merge commit 'e3735f9' 2015-03-30 08:33:29 -04:00
Marc Delisle
e3735f951c Merge pull request #1619 from madhuracj/bug4821 
bug #4821 Timed-out import fails to restart when file represented
 2015-03-30 08:29:58 -04:00
Marc Delisle
7e6e27100f Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-30 07:45:00 -04:00
Marc Delisle
43c2a3dc96 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-03-30 07:43:33 -04:00
Marc Delisle
4f618b432c Make message translatable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-30 07:42:45 -04:00
Weblate
9b892eefaa Merge remote-tracking branch 'origin/master' 2015-03-30 13:33:13 +02:00
Kyeong Su Shin
65e5c8ed38 Translated using Weblate (Korean) 
Currently translated at 81.7% (2487 of 3042 strings)

[CI skip]
 2015-03-30 13:33:09 +02:00
Marc Delisle
c6052ace97 Merge pull request #1618 from pratiksethia1/minorCorrections 
changes titles and minor correction
 2015-03-30 07:33:03 -04:00
Madhura Jayaratne
f6dd7c2cd4 Pass local_import_file 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-30 16:14:59 +05:30
Madhura Jayaratne
4c0b0f9687 bug #4821 Timed-out import fails to restart when file represented 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-30 16:01:51 +05:30
pratiksethia1
3236ce0153 changes titles 
Signed-off-by: Pratik Sethia <pratiksethia1@gmail.com>
 2015-03-30 05:05:39 +05:30
Marc Delisle
9b403471e7 4.3.13 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-29 09:05:39 -04:00
Marc Delisle
3cdd9f03bc Merge branch 'QA_4_4' 2015-03-29 09:04:47 -04:00
Marc Delisle
3b8c3ebeca 4.3.13 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-29 09:04:18 -04:00
Marc Delisle
8e75b28059 Merge branch 'QA_4_3' into QA_4_4 2015-03-29 09:03:13 -04:00
Marc Delisle
2d47886fcf 4.3.14-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-29 09:02:28 -04:00
Weblate
103dc7e210 Merge remote-tracking branch 'origin/master' 2015-03-29 14:00:53 +02:00
Kyeong Su Shin
518ee9180b Translated using Weblate (Korean) 
Currently translated at 80.9% (2462 of 3042 strings)

[CI skip]
 2015-03-29 14:00:50 +02:00
Sevdimali İsa
a817a5dad5 Translated using Weblate (Azerbaijani) 
Currently translated at 57.3% (1745 of 3043 strings)

[CI skip]
 2015-03-29 14:00:48 +02:00
Marc Delisle
6c7c9dc7c3 Merge branch 'QA_4_4' 2015-03-29 07:59:30 -04:00
Marc Delisle
d0e7c40918 Merge commit '22199cd' 2015-03-29 07:59:14 -04:00
Weblate
5b2c00f557 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-03-29 13:58:48 +02:00
Kyeong Su Shin
5beb56159f Translated using Weblate (Korean) 
Currently translated at 81.2% (2465 of 3032 strings)

[CI skip]
 2015-03-29 13:58:45 +02:00
Sevdimali İsa
2f2ec6b03e Translated using Weblate (Azerbaijani) 
Currently translated at 57.3% (1740 of 3032 strings)

[CI skip]
 2015-03-29 13:58:44 +02:00
Marc Delisle
b28ae18f22 Merge branch 'QA_4_3' into QA_4_4 2015-03-29 07:57:31 -04:00
Marc Delisle
adfd70d290 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-29 07:55:06 -04:00
Andrea Vallorani
cc56e09667 Bug #4718 simulate query fails 
It is not an elegant solution, but it seems functional.
It avoids all the errors caused by the presence of functions in the query.
The $extra_where_clause variable was valorized but never appended to the WHERE clause. (I think that was a mistake)

Signed-off-by: Andrea Vallorani <andrea.vallorani@gmail.com>
 2015-03-29 07:46:49 -04:00
Kristjan Räts
613e1467a4 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3042 of 3042 strings)

[CI skip]
 2015-03-29 10:24:12 +02:00
Huseyn
22199cd89d Translated using Weblate (Azerbaijani) 
Currently translated at 56.0% (1700 of 3032 strings)

[CI skip]
 2015-03-28 23:52:45 +01:00
Huseyn
508f02377d Translated using Weblate (Azerbaijani) 
Currently translated at 56.0% (1705 of 3043 strings)

[CI skip]
 2015-03-28 23:52:42 +01:00
Sevdimali İsa
c730c097d5 Translated using Weblate (Azerbaijani) 
Currently translated at 56.0% (1700 of 3032 strings)

[CI skip]
 2015-03-28 23:45:57 +01:00
Sevdimali İsa
6a1f37d774 Translated using Weblate (Azerbaijani) 
Currently translated at 56.0% (1705 of 3043 strings)

[CI skip]
 2015-03-28 23:45:52 +01:00
Marc Delisle
04b17cddd2 Merge branch 'QA_4_4' 2015-03-28 14:54:50 -04:00
Weblate
b990e2646e Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-03-28 19:54:38 +01:00
Hiroshi Chiyokawa
33ed37b977 Translated using Weblate (Japanese) 
Currently translated at 73.4% (2227 of 3032 strings)

[CI skip]
 2015-03-28 19:54:35 +01:00
Deky Arifianto
03c9c92ef4 Translated using Weblate (Indonesian) 
Currently translated at 73.5% (2231 of 3032 strings)

[CI skip]
 2015-03-28 19:54:34 +01:00
Sevdimali İsa
90396a15da Translated using Weblate (Azerbaijani) 
Currently translated at 56.0% (1698 of 3032 strings)

[CI skip]
 2015-03-28 19:54:32 +01:00
Marc Delisle
53e26b5656 Merge branch 'QA_4_3' into QA_4_4 2015-03-28 14:53:09 -04:00
Marc Delisle
a128d12151 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-28 14:50:37 -04:00
Marc Delisle
18feac258f Merge pull request #1617 from devenbansod/bug-#4820 
Tries to fix bug-#4820
 2015-03-28 14:48:58 -04:00
Deven Bansod
b52a17608c Tries to fix bug-#4820 
Removed the str_replace on $anchor as it seemed to break the anchor links.

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-03-29 03:55:01 +05:30
Weblate
772280bb34 Merge remote-tracking branch 'origin/master' 2015-03-28 13:03:24 +01:00
Hiroshi Chiyokawa
d4991236ae Translated using Weblate (Japanese) 
Currently translated at 73.1% (2226 of 3042 strings)

[CI skip]
 2015-03-28 13:03:21 +01:00
Deky Arifianto
2131de7fa2 Translated using Weblate (Indonesian) 
Currently translated at 73.3% (2230 of 3042 strings)

[CI skip]
 2015-03-28 13:03:19 +01:00
Sevdimali İsa
816ea29b4f Translated using Weblate (Azerbaijani) 
Currently translated at 55.9% (1703 of 3043 strings)

[CI skip]
 2015-03-28 13:03:18 +01:00
Marc Delisle
778ea5f2dc Merge pull request #1613 from nijel/sql-session 
Close session for executing user SQL queries
 2015-03-28 08:03:15 -04:00
Madhura Jayaratne
93292f3bcb Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 19:44:41 +05:30
Madhura Jayaratne
ebb613ab51 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-03-27 19:41:32 +05:30
Madhura Jayaratne
8f58c8f851 bug #4805 Inline edit broken when using functions in query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 19:39:11 +05:30
Madhura Jayaratne
c06c23f560 Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 19:24:00 +05:30