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

108872 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
cc68f8d147 Merge branch 'QA_4_7' 2017-02-13 12:53:47 +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
Weblate
881b7daa03 Merge remote-tracking branch 'origin/master' 2017-02-13 12:32:31 +01:00
Fujiwara Software
7011eca6c1 Translated using Weblate (Japanese) 
Currently translated at 71.2% (2278 of 3199 strings)

[CI skip]
 2017-02-13 12:32:29 +01:00
Michal Čihař
a58df231b0 Merge pull request #12989 from jublonet/feature/fix-checkall-spacing 
Remove trailing spacing for Check all link text
 2017-02-13 12:32:21 +01:00
Michal Čihař
eff9cc26e6 Merge branch 'QA_4_7' 2017-02-13 12:24:52 +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
Weblate
5eddd3af11 Merge remote-tracking branch 'origin/master' 2017-02-13 11:25:24 +01:00
Domen
e083908743 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3199 of 3199 strings)

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

[CI skip]
 2017-02-13 11:25:21 +01:00
Michal Čihař
e1c0084ad7 Merge branch 'QA_4_7' 2017-02-13 11:25:07 +01:00
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ř
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
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
Joshua Atkins
ae7923177b Remove trailing spacing for Check all link text 
Signed-off-by: Joshua Atkins <support@jublo.net>
 2017-02-11 17:03:00 +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