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

108850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
094afae6cc Merge commit '924aabf652f35a35ccfe66a6fa706bb434282081' 2017-02-13 11:24:55 +01:00
Michal Čihař
901784b3b8 Merge commit '3a21b99e63ca715ed2ad2d1b772d50ea9bd7abdf' 2017-02-13 11:24:44 +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
b966278867 Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 97.9% (3134 of 3199 strings)

[CI skip]
 2017-02-13 06:44:19 +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
hd hd
b54d454307 Translated using Weblate (English (United Kingdom)) 
Currently translated at 78.1% (2499 of 3199 strings)

[CI skip]
 2017-02-12 21:45:01 +01:00
Weblate
d4483ea250 Merge remote-tracking branch 'origin/master' 2017-02-09 16:47:43 +01:00
tmtisfree
148f0637a4 Translated using Weblate (French) 
Currently translated at 99.2% (3175 of 3199 strings)

[CI skip]
 2017-02-09 16:47:40 +01:00
Michal Čihař
9639b1e1c8 Merge branch 'QA_4_7' 2017-02-09 16:47:27 +01:00
Michal Čihař
88d9d2d0b0 Merge commit '049382b8132a90d2953b48fd0e101f483b29b56e' 2017-02-09 16:47:19 +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
8765588ef5 Merge branch 'QA_4_7' 2017-02-07 22:35:21 +05:30
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ř
2a0d67f259 Merge branch 'QA_4_7' 2017-02-07 10:30:57 +01:00
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ř
9bc325fefb Merge branch 'QA_4_7' 2017-02-07 10:26:50 +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
Isaac Bennetch
e00b03a24e Add hint about updating Docker at release time 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-02-06 09:20:33 -05:00
Michal Čihař
a338d6e7f0 Merge branch 'QA_4_7' 2017-02-06 15:05:08 +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ř
52db42edfc Merge branch 'QA_4_7' 2017-02-06 14:10:25 +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ř
9859461733 Merge branch 'QA_4_7' 2017-02-06 13:37:40 +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ř
ebfc86934b Merge branch 'QA_4_7' 2017-02-06 13:32:27 +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ř
3cfe34985d Merge branch 'QA_4_7' 2017-02-06 13:26:24 +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
Michal Čihař
5d3a6fbc25 Merge branch 'QA_4_7' 2017-02-06 13:23:09 +01:00
Michal Čihař
569fcc1ef3 Merge commit '3d29350b0a6145e07632e6bcc95f1e44bd6d06e6' 2017-02-06 13:22:59 +01:00
Michal Čihař
9b534e55ca Merge pull request #12950 from nijel/connect_type 
Remove connect_type setting
 2017-02-06 13:22:11 +01:00
Michal Čihař
162d135662 Clarify socket connection docs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-06 12:55:46 +01:00
Weblate
3d29350b0a Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-06 11:30:32 +01:00
Franco
33717e7268 Translated using Weblate (Spanish) 
Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]
 2017-02-06 11:30:31 +01:00
Weblate
754b9dc98e Merge remote-tracking branch 'origin/master' 2017-02-06 11:30:29 +01:00
Capita-Finnish
7201940bcc Translated using Weblate (Finnish) 
Currently translated at 69.4% (2222 of 3199 strings)

[CI skip]
 2017-02-06 11:30:29 +01:00
Franco
b734097a5c Translated using Weblate (Spanish) 
Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]
 2017-02-06 11:30:29 +01:00
Capita-Finnish
a3377670ed Translated using Weblate (Finnish) 
Currently translated at 69.4% (2222 of 3199 strings)

[CI skip]
 2017-02-06 11:30:26 +01:00
Michal Čihař
474cda3c90 Merge branch 'QA_4_7' 2017-02-06 11:30:09 +01:00
Michal Čihař
7a2222ae76 Merge commit '2559d3e448cddd8da4d536b453b10cec7f0d3349' 2017-02-06 11:30:01 +01:00
Michal Čihař
87ebf137c1 Add example for customizing configuration file using docker-compose 
Fixes https://github.com/phpmyadmin/docker/issues/82

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-06 11:29:15 +01:00
Isaac Bennetch
34946a285b Improve documentation on socket or tcp/ip setup 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-04 17:32:04 +01:00
Franco
2559d3e448 Translated using Weblate (Spanish) 
Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]
 2017-02-04 02:28:32 +01:00