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

101915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
cbb6fe04a0 Merge commit '6541323cac72e209b3b4195e5f292b09fccebc60' 2015-08-19 14:53:53 +02:00
Weblate
1d97280182 Merge remote-tracking branch 'origin/master' 2015-08-19 14:33:08 +02:00
Andrey Aleksanyants
1f652a59fd Translated using Weblate (Armenian) 
Currently translated at 60.3% (1935 of 3205 strings)

[CI skip]
 2015-08-19 14:33:04 +02:00
Marc Delisle
da05ed6316 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-19 08:32:45 -04:00
Weblate
6541323cac Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-08-19 14:30:13 +02:00
Andrey Aleksanyants
15bace4918 Translated using Weblate (Armenian) 
Currently translated at 59.9% (1821 of 3040 strings)

[CI skip]
 2015-08-19 14:30:09 +02:00
Marc Delisle
85dc44b557 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-19 08:29:51 -04:00
Martin Herndl
97d0415687 Fixes #11386 Cannot import database with long data in one column 
Signed-off-by: Martin Herndl martin.herndl@world4you.com
 2015-08-19 08:28:26 -04:00
Παναγιώτης Παπάζογλου
235995b8fc Translated using Weblate (Greek) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2015-08-19 13:01:22 +02:00
Michal Čihař
4b41406009 Use HTTPS to submit error reports 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-08-19 07:49:45 +02:00
Michal Čihař
7e41134174 Merge branch 'QA_4_4' 2015-08-18 17:27:11 +02:00
Michal Čihař
6328c5a8f2 Ignore actually 5.3... 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-08-18 17:27:04 +02:00
Michal Čihař
079cb4f283 Merge branch 'QA_4_4' 2015-08-18 16:21:18 +02:00
Michal Čihař
bcc4c77f43 Disable runkit for 4.3 as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-08-18 16:21:13 +02:00
Michal Čihař
b0655cf775 Disable runkit for 4.3 as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-08-18 16:21:03 +02:00
Michal Čihař
84564360f6 Merge branch 'QA_4_4' 2015-08-18 16:14:22 +02:00
Michal Čihař
7a92707952 PHP 5.6 patch is merged upstream 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-08-18 16:14:13 +02:00
Marc Delisle
7be11bfcdb Continue refactoring db tracking 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-18 08:44:28 -04:00
Madhura Jayaratne
53ae242e83 Fix x coordinates of these points are repeated as y coordinates 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-18 16:29:29 +05:30
Madhura Jayaratne
c5252a32a2 Set initial values 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-18 16:22:02 +05:30
Madhura Jayaratne
a3217f4335 Move GIS editor out of insert form so it wont be affected by input validations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-18 16:21:39 +05:30
Madhura Jayaratne
b0dd1d54fe Align 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-18 11:26:32 +05:30
Madhura Jayaratne
0368c52016 Allow using function that takes geometry data as the second parameter 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-18 11:26:21 +05:30
Madhura Jayaratne
768c9ba5e9 Fix more geometry function types in search 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-18 10:52:12 +05:30
Madhura Jayaratne
962fa4b73c Fix searching using unary geometry functions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-18 10:33:05 +05:30
Madhura Jayaratne
a13ed957d9 $this is not defined in template 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-18 09:36:19 +05:30
Madhura Jayaratne
cda7906f97 Fix missing template 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-18 09:35:38 +05:30
Madhura Jayaratne
644a00c220 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-08-18 09:15:13 +05:30
Madhura Jayaratne
4519205a94 Remove additional space between the icon and the doc link 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-18 09:14:05 +05:30
Franco
2323602367 Translated using Weblate (Spanish) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2015-08-17 20:41:59 +02:00
Madhura Jayaratne
cac3676b94 Hash and Key type partitions does not support dropping 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-17 23:27:52 +05:30
Madhura Jayaratne
0eabaf2dd7 Load comments at sub partition level is sub partitioning is used 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-17 23:02:29 +05:30
Madhura Jayaratne
57af2402bc Add comment column to partition details 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-17 22:43:58 +05:30
Madhura Jayaratne
a847fc5f15 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-08-17 21:52:38 +05:30
Madhura Jayaratne
5568970c85 Fix #11408 Export breaks when field name is 0 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-17 21:51:25 +05:30
Marc Delisle
e1058316f9 Clarify doc 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-17 10:38:18 -04:00
Marc Delisle
269dbd1867 Merge branch 'QA_4_4' 2015-08-17 10:27:04 -04:00
Marc Delisle
149ecfd058 Merge commit '5427111' 2015-08-17 10:26:58 -04:00
Marc Delisle
9b2b09e12e Fixes #11406 Missing quotes after calling "distinct values" 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-17 10:26:13 -04:00
Weblate
68c588f1ea Merge remote-tracking branch 'origin/master' 2015-08-17 14:28:00 +02:00
Achchuthan Yogarajah
bf550e1f0a Translated using Weblate (Tamil) 
Currently translated at 35.9% (1151 of 3205 strings)

[CI skip]
 2015-08-17 14:27:55 +02:00
Madhura Jayaratne
11d289b6b0 Merge branch 'QA_4_4' 2015-08-17 17:57:20 +05:30
Weblate
5427111c3e Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-08-17 14:22:46 +02:00
Achchuthan Yogarajah
9d18b0b9b1 Translated using Weblate (Tamil) 
Currently translated at 38.6% (1174 of 3040 strings)

[CI skip]
 2015-08-17 14:22:42 +02:00
Phillip Rohmberger
97ad6cabb3 Translated using Weblate (German) 
Currently translated at 100.0% (3040 of 3040 strings)

[CI skip]
 2015-08-17 14:22:38 +02:00
Andrey Aleksanyants
fe179cf740 Translated using Weblate (Armenian) 
Currently translated at 59.1% (1797 of 3040 strings)

[CI skip]
 2015-08-17 14:22:35 +02:00
Madhura Jayaratne
af75d2c825 Backport fix #11404 "Switch to copied table" doesn't work 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-17 17:52:24 +05:30
Kristjan Räts
76842c8645 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2015-08-17 08:40:53 +02:00
Madhura Jayaratne
55c9f0f22a Fix #11404 "Switch to copied table" doesn't work 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-17 08:44:30 +05:30
Isaac Bennetch
d818847412 Merge pull request #11403 from udan11/update 
Update sql-parser.
 2015-08-16 22:23:06 -04:00