gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
108,826 Commits 12 Branches 481 Tags 2.4 GiB
889ccb6555
Commit Graph

108826 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
889ccb6555 Better defaults when creating multi fields foreign key 
It does not make sense to set all fields to one key.

Fixes #12980

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-14 11:09:57 +01:00
Michal Čihař
e7951f733d List all databses in navigation panel database dropdown 
Fixes #12996

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-14 11:02:02 +01:00
Michal Čihař
8767499594 Avoid using ARRAY_FILTER_USE_KEY 
As these are not supported on PHP 5.5 and HHVM.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-14 10:50:03 +01:00
Michal Čihař
600373e9ba Avoid messing up with configuration values having / in keys 
This confuses user configuration as it does use these values while rest
of the code does not. So the setting appears to be active while it does
not actually work.

Fixes #12832

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-14 10:19:45 +01:00
Michal Čihař
87a2953b78 Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 15:59:36 +01:00
Michal Čihař
3d8e4b74d0 Fix GIS tests 
- correct order of parameters for assertEquals
- fix expectations for zero values

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 15:58:58 +01:00
Weblate
0738c2f7e5 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-13 15:31:55 +01:00
Yungu Kim
45c6fb1ab7 Translated using Weblate (Korean) 
Currently translated at 81.9% (2622 of 3199 strings)

[CI skip]
 2017-02-13 15:31:53 +01:00
Michal Čihař
58472a97d2 Fixed javascript error on 3NF normalization 
Fixes #12927

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 15:30:51 +01:00
Michal Čihař
7da83511ec Do not use deprecated jQuery functionality 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 15:24:25 +01:00
Weblate
8cc1232063 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-13 15:07:38 +01:00
Yungu Kim
55ca7bb3a3 Translated using Weblate (Korean) 
Currently translated at 81.0% (2592 of 3199 strings)

[CI skip]
 2017-02-13 15:07:37 +01:00
Michal Čihař
dda0d8b69d Load server stats queries scripts in order 
We can not load first script which uses later one.

Fixes #12934

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 15:06:13 +01:00
Weblate
6eede38ac1 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-13 15:01:24 +01:00
Yungu Kim
6f9b505b1a Translated using Weblate (Korean) 
Currently translated at 80.9% (2588 of 3199 strings)

[CI skip]
 2017-02-13 15:01:22 +01:00
Michal Čihař
bca2e1c588 Use standard way for getting token value in designer 
This way we share code with rest of phpMyAdmin, not building it again.

Fixes #12804

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 15:00:11 +01:00
Michal Čihař
a083a4c839 Fixed manipulation with GIS data having zero coordinates 
Another example when using PHP's empty() leads to problems.

Fixes #12957

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 14:44:47 +01:00
Michal Čihař
522c0598fa Sort column names as well 
Fixes #12941

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 14:17:20 +01:00
Michal Čihař
8f611f05cf Fixed rendering of foreign key browsing 
Fixes #12985

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 13:51:13 +01:00
Weblate
287e384cf2 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-13 12:54:00 +01:00
Fujiwara Software
0f8ee2a630 Translated using Weblate (Japanese) 
Currently translated at 71.2% (2278 of 3199 strings)

[CI skip]
 2017-02-13 12:53:59 +01:00
Michal Čihař
d54061d1f8 Include token in hidden fields 
This will fix few broken users:

- error reporting
- table search in navigation
- user preferences

Fixes #12964

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 12:53:36 +01:00
Michal Čihař
fc1c784a43 Changelog entry for #12922 and #12933 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 12:24:20 +01:00
Michal Čihař
0cba123659 Specify sorting order 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 12:23:46 +01:00
Piyush Agrawal
82429cd01c ascending order of bookmarks list 
Signed-off-by: Piyush Agrawal <poush12@gmail.com>
 2017-02-13 12:22:11 +01:00
Michal Čihař
0038245ec8 Improved rendering of new version information 
- remove extra space in from of new version information
- add space between sentence and new version

Fixes #12981

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 11:56:36 +01:00
Michal Čihař
baa390df89 Fixed error when loading favorite tables to console 
The token was missing in POST request.

Fixes #12990

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 11:34:57 +01:00
Michal Čihař
bcc7c7af35 Allow secure.php.net in url redirector 
Fixes #12993

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 11:30:42 +01:00
Michal Čihař
a2fbafaa38 Merge branch 'QA_4_6' into QA_4_7 2017-02-13 11:24:08 +01:00
Weblate
4ac48de1c8 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-13 11:23:37 +01:00
Domen
f4974f25b4 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]
 2017-02-13 11:23:37 +01:00
tmtisfree
046e709dd2 Translated using Weblate (French) 
Currently translated at 99.3% (3177 of 3199 strings)

[CI skip]
 2017-02-13 11:23:35 +01:00
Michal Čihař
924aabf652 Do not show language selector without choices 
Move the check from template to the code, so that the selection is
completely hidden when there is nothing to select.

Fixes #12988

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 11:22:43 +01:00
Michal Čihař
cdd5f7f6d3 Do not append ? at the URL if not needed 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 11:08:43 +01:00
Michal Čihař
b2dd91ebe3 Use URL for constructing params instead of concatenation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 11:08:31 +01:00
hd hd
3a21b99e63 Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 97.9% (3134 of 3199 strings)

[CI skip]
 2017-02-13 06:44:25 +01:00
hd hd
7367354bd2 Translated using Weblate (English (United Kingdom)) 
Currently translated at 78.1% (2499 of 3199 strings)

[CI skip]
 2017-02-12 21:45:10 +01:00
Weblate
dce6f681ee Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-09 16:46:39 +01:00
tmtisfree
834bf94697 Translated using Weblate (French) 
Currently translated at 99.2% (3175 of 3199 strings)

[CI skip]
 2017-02-09 16:46:37 +01:00
Michal Čihař
049382b813 Merge pull request #12974 from ibennetch/autoload-error-QA_4_7 
Better error message when Composer files are missing.
 2017-02-09 16:46:28 +01:00
Isaac Bennetch
8db5de02a0 Better error message when Composer files are missing. 
Fixes #12972

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-02-09 10:32:21 -05:00
Madhura Jayaratne
99e4e0d1ee Fix #12966 After adding a column ADD INDEX option won't be displayed when enabling AI 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2017-02-07 22:32:22 +05:30
Michal Čihař
63db3da30a Enclose exports in transaction by default 
Fixes #12960

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-07 10:30:45 +01:00
Michal Čihař
e79574b461 Provide more detailed guideline for customizing configuration 
See https://github.com/phpmyadmin/docker/issues/82

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-07 10:26:22 +01:00
Michal Čihař
a927c52322 Extend lost password FAQ 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-06 15:04:58 +01:00
Michal Čihař
f26d74544b Add Docker sample for haproxy and subpath 
Fixes https://github.com/phpmyadmin/docker/issues/101

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-06 14:09:15 +01:00
Michal Čihař
0d9c1101ac Fixed export of tracking data 
Fixes #12954

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-06 13:37:21 +01:00
Michal Čihař
f73a98e421 Fixed database renaming 
Fixes #12955

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-06 13:31:39 +01:00
Michal Čihař
80de044517 Changelog entry for #12904 and #12939 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-06 13:26:04 +01:00
Piyush Agrawal
b575f7ef1b db_central_columns: new column collapsing issue 
Signed-off-by: Piyush Agrawal <poush12@gmail.com>
 2017-02-06 13:25:05 +01:00