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

112065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
bb60b9d53b Merge branch 'QA_4_7' 2017-11-29 15:19:04 +01:00
Michal Čihař
a957f26947 Changelog entries for #11688 and #13466 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 15:16:59 +01:00
Michal Čihař
6a0345b10e
Merge pull request #13847 from nijel/collation 
Move collation connection setting to user preferences
 2017-11-29 15:07:39 +01:00
Michal Čihař
3b6a994dcd Move collation connection setting to user preferences 
It is now handled same way as other user settings.

Issue #11688
Issue #13466

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 14:16:31 +01:00
Weblate
c6f3c4002c Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-11-29 12:52:07 +01:00
Giovanni Sora
5ec4a107d0 Translated using Weblate (Interlingua) 
Currently translated at 75.5% (2424 of 3207 strings)

[CI skip]
 2017-11-29 12:52:04 +01:00
Michal Čihař
63f5b90ad5 Merge branch 'QA_4_7' 2017-11-29 12:51:31 +01:00
Michal Čihař
7bff1263c8 Revert limitation on phpseclib dependency 
Only 2.0.8 is broken, so conflict with that.

Fixes #13846

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 12:50:15 +01:00
Michal Čihař
dd38309300 Include timestamp when creating event in selenium tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 12:47:41 +01:00
Michal Čihař
14e78f79bb Avoid error when event is not really added 
This can easily happen when it was scheduled in past, MySQL then just ignores it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 12:44:41 +01:00
Michal Čihař
51a65e022b Avoid using deprecated jQuery functions 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 12:37:18 +01:00
Michal Čihař
843906a827 Ensure navigation does not break on setting invalid width 
This can be result of failed request, so fallback to defaults.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 12:09:32 +01:00
Michal Čihař
8b511acd95 Use PMA_Config to get configuration value 2017-11-29 11:32:11 +01:00
Weblate
9bea690aa9 Merge remote-tracking branch 'origin/master' 2017-11-29 10:32:07 +01:00
Giovanni Sora
7036a2713d Translated using Weblate (Interlingua) 
Currently translated at 75.2% (2474 of 3287 strings)

[CI skip]
 2017-11-29 10:32:01 +01:00
Michal Čihař
fe493f6d46 Avoid horizontal scrolling 
It would have to subtract width of navigation and is not needed in most cases.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 10:31:34 +01:00
Burak Yavuz
5479fe57b3 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3287 of 3287 strings)

[CI skip]
 2017-11-29 09:54:05 +01:00
Weblate
cef7ca5d37 Merge remote-tracking branch 'origin/master' 2017-11-29 09:45:11 +01:00
Burak Yavuz
597ad1fc18 Translated using Weblate (Turkish) 
Currently translated at 99.9% (3286 of 3287 strings)

[CI skip]
 2017-11-29 09:45:10 +01:00
Michal Čihař
6aeae463d1 Merge branch 'QA_4_7' 2017-11-29 09:44:46 +01:00
Michal Čihař
f8ccc4db13 Stick with phpseclib < 2.0.8 in 4.7 branch 
We can not remove PHP 5.5 support from maintenance branch, so there is
no other way than sticking with older phpseclib.

See https://github.com/phpseclib/phpseclib/issues/1218

Issue #13846

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 09:35:39 +01:00
Michal Čihař
8bc91e9b58 Revert "Compatibility with phpseclib 2.0.8" 
This reverts commit a450935e53.

We really need to stick on 2.0.7 for 4.7 branch to keep PHP 5.5 support.

Issue #13846
 2017-11-29 09:34:44 +01:00
Michal Čihař
a8f358e2c6 Merge branch 'QA_4_7' 2017-11-29 09:21:53 +01:00
Michal Čihař
a450935e53 Compatibility with phpseclib 2.0.8 
Apparently upgrade from 2.0.7 to 2.0.8 changed API in several ways.

See https://github.com/phpseclib/phpseclib/issues/1218

Fixes #13846

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 09:13:23 +01:00
Michal Čihař
75e648f882 Merge branch 'QA_4_7' 2017-11-29 08:27:16 +01:00
Michal Čihař
63feb840c6 Merge commit '603a6851ff90caf2de0959360e8b36809dcf1d38' 2017-11-29 08:27:07 +01:00
Weblate
a6e1ee8ef9 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-11-29 01:03:20 +01:00
Dr. Nagy Elemér Károly
4002b1af71 Translated using Weblate (Hungarian) 
Currently translated at 98.8% (3170 of 3207 strings)

[CI skip]
 2017-11-29 01:03:17 +01:00
Han Velthuis
85b6a37601 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2017-11-29 01:03:13 +01:00
Maurício Meneghini Fauth
603a6851ff
Merge pull request #13844 from ibennetch/columncomment 
Documentation for ShowColumnComments
 2017-11-28 22:03:02 -02:00
Domen
0afa0b735e Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3287 of 3287 strings)

[CI skip]
 2017-11-28 20:39:53 +01:00
Isaac Bennetch
8e1469c86e Documentation for ShowColumnComments 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-11-28 13:39:09 -05:00
Weblate
e42444f926 Merge remote-tracking branch 'origin/master' 2017-11-28 19:32:56 +01:00
Burak Yavuz
381a3bd14d Translated using Weblate (Turkish) 
Currently translated at 99.9% (3285 of 3287 strings)

[CI skip]
 2017-11-28 19:32:55 +01:00
Matteo Regazzi
d528b899bf Translated using Weblate (Italian) 
Currently translated at 99.3% (3265 of 3287 strings)

[CI skip]
 2017-11-28 19:32:48 +01:00
Han Velthuis
0a7d307a28 Translated using Weblate (Dutch) 
Currently translated at 99.9% (3285 of 3287 strings)

[CI skip]
 2017-11-28 19:32:44 +01:00
Michal Čihař
b74b23131c Scroll element into view 
It might be hidden by console

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 18:51:18 +01:00
Michal Čihař
72112454fc Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 16:23:06 +01:00
Michal Čihař
48c0a1081d Remember state of navigation panel 
The NavigationPanel width is now 0 when panel should be collapsed.

Issue #13466
Fixes #13397

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 16:07:08 +01:00
Michal Čihař
d76606a869 Remove cookie cleanup code 
We no longer store any structured information in the cookies, so the
upgrade path is not really needed. Also this can cause problems with
third party integrations.

Issue #11688
Fixes #13480

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 15:51:33 +01:00
Michal Čihař
8dc0f4b819 Use session to indicate switching to new database 
There is no reason to store this in cookies.

Issue #11688

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 15:51:33 +01:00
Weblate
92a0b8451c Merge remote-tracking branch 'origin/master' 2017-11-28 15:37:28 +01:00
Dr. Nagy Elemér Károly
f474b321df Translated using Weblate (Hungarian) 
Currently translated at 96.0% (3147 of 3278 strings)

[CI skip]
 2017-11-28 15:37:24 +01:00
Michal Čihař
2e03d11e34 Remove artifical limit for navigation width 
I have no clue what were the original intentions here, but this doesn't
make sense at all.

Fixes #13816

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 15:36:12 +01:00
Michal Čihař
216f403c28 Store navigation width in user preferences 
There is no need to have this separetely.

Issue #13466
Issue #11688

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 15:36:08 +01:00
Michal Čihař
263722fef8 Move theme selection to index.php 
- It really makes no sense to do this on every request.
- We want to redirect after changing to make sure page is loaded with new theme.
- Use value only from POST request (it used to be set by GET in past as well).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 15:20:55 +01:00
Michal Čihař
f9c73c7b10 Remove special casing for font size 
It is now stored in configuration in same way as any other setting.

Issue #13466
Issue #11688

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 15:16:01 +01:00
Michal Čihař
cbbf0d5ccf Integrate debug console settings into user preferences 
Issue #13466
Issue #11688

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 13:52:07 +01:00
Michal Čihař
b30ab4af58 Generalize code for console preferences 
We can reuse and better cache locally the operations to avoid additional
roundtrip to server when changing settings.

Issue #13466
Issue #11688

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 13:45:14 +01:00
Michal Čihař
dc51711a47 Store console configuration in user preferences 
Issue #13466
Issue #11688

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 13:31:17 +01:00