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

98775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Madhura Jayaratne
f70cda04e5 Merge branch 'QA_4_4' 2015-03-27 19:23:47 +05:30
Weblate
42ee547bb6 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-03-27 14:53:38 +01:00
Ahmed Saleh Abd El-Raouf Ismae
48f149e855 Translated using Weblate (Arabic) 
Currently translated at 38.4% (1167 of 3032 strings)

[CI skip]
 2015-03-27 14:51:29 +01:00
Madhura Jayaratne
9c56ea6950 Make translatable 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 19:20:16 +05:30
Weblate
166c94dc31 Merge remote-tracking branch 'origin/master' 2015-03-27 14:47:15 +01:00
Ahmed Saleh Abd El-Raouf Ismae
0c9ff8914e Translated using Weblate (Arabic) 
Currently translated at 38.3% (1167 of 3042 strings)

[CI skip]
 2015-03-27 14:47:12 +01:00
Madhura Jayaratne
050319f2e2 rfe #354 PDF schema sort options 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 19:16:49 +05:30
Madhura Jayaratne
3a5b3fd27a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-03-27 16:47:38 +05:30
Michal Čihař
b249614d06 Merge native and multibyte tests 
Having in all cases dozen of skipped test just makes the results
readability worse. So it makes little sense unless we can figure out way
to test both implementations.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-03-27 08:44:39 +01:00
Madhura Jayaratne
0d2cb6e29b Remove icon used for query window 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 10:47:09 +05:30
Madhura Jayaratne
251a6282e2 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 10:37:07 +05:30
Madhura Jayaratne
d32f555a56 bug Missing sort icons in monitor 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 10:35:16 +05:30
Madhura Jayaratne
f74969651d Use b_help icon here 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 10:08:51 +05:30
Weblate
bce658b7c5 Merge remote-tracking branch 'origin/master' 2015-03-27 05:28:12 +01:00
Sevdimali İsa
3eef6920d1 Translated using Weblate (Azerbaijani) 
Currently translated at 53.6% (1633 of 3043 strings)

[CI skip]
 2015-03-27 05:28:09 +01:00
Madhura Jayaratne
094f1f87e7 Merge branch 'QA_4_4' 2015-03-27 09:57:57 +05:30
Weblate
071e43fbe2 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-03-27 05:25:01 +01:00
Sevdimali İsa
424a3c1f4a Translated using Weblate (Azerbaijani) 
Currently translated at 53.8% (1633 of 3032 strings)

[CI skip]
 2015-03-27 05:24:57 +01:00
Madhura Jayaratne
6431883648 Missing tooltip in monitor 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 09:53:43 +05:30