gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,740 Commits 12 Branches 481 Tags 2.4 GiB
14910ac2ba
Commit Graph

105740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
14910ac2ba Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 15:41:01 +02:00
Michal Čihař
9a59032379 Improve collation descriptions 
- detect new languages
- detect new Unicode variants
- better describe collation method

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 15:33:33 +02:00
Michal Čihař
6429689607 Simplify collations reading 
Remove dependency from charsets to collations, we really do not need it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 15:20:11 +02:00
Michal Čihař
a7a44c28c5 All charsets/collation we get from the MySQL server are available 
There is no need for explicit checking for availability later in the
code.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 15:17:32 +02:00
Michal Čihař
b311780d76 Separate methods for charset and collation dropdowns 
They do not share much code in the end and this way the code is more
readable.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 13:04:41 +02:00
Michal Čihař
3e2029e750 Move MySQL charsets handling to the Charsets class 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 12:55:42 +02:00
Michal Čihař
72099ff05a Ensure this is always defined in the global scope 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 12:46:29 +02:00
Michal Čihař
0758b601e7 Move charset query generation to to the Util class 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 12:07:27 +02:00
Michal Čihař
be69b146f7 Use just class name for already used classes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 12:03:37 +02:00
Michal Čihař
e2deac4b22 Move getting collation to the DBI layer 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 11:42:29 +02:00
Michal Čihař
1fe277e988 Use $this instead of accessing DBI from globals 
We're already in the object scope, there is no need to go to globals for
self.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 11:19:33 +02:00
Michal Čihař
f9a02cde30 Simplify code by storing frequently used array members in variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 11:14:57 +02:00
Michal Čihař
a8820cbd4e Remove not needed mysql prefix from static variables 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 11:14:57 +02:00
Michal Čihař
d30bb0581c Load collations only when needed 
In many cases we need only charset information, so split the loading.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 11:14:57 +02:00
Michal Čihař
e1db0a72cf Remove unused code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 11:06:00 +02:00
Michal Čihař
54f0d14ea9 Remove session caching for MySQL charsets 
This cache makes the session data quite huge giving performance penalty
when loading the cache. Loading the data again from MySQL server is
faster than this.

Also the charsets data is really needed only on few pages, the overall
impact of this caching is negative.

Caching the data per request however is useful.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 11:04:09 +02:00
Michal Čihař
cfc2f1cb05 Move charsets obtaining to the Charsets class 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 10:49:09 +02:00
Michal Čihař
cd4008b3d7 Move MySQL charset maps to separate class 
This allows us to load it only when needed

Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 10:33:40 +02:00
Michal Čihař
3e8145a4a5 Remove unused variable mysql_collations_flat 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 10:21:53 +02:00
Michal Čihař
fb5b681925 Remove checks for older PHP versions 
We require 5.5, so there is no need to check for >= 5.4 or similar.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 10:10:25 +02:00
Michal Čihař
a62fdaa223 Fix typo 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 09:54:40 +02:00
Weblate
53db60e190 Merge remote-tracking branch 'origin/master' 2016-04-11 09:52:52 +02:00
Burak Yavuz
95890fa895 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-04-11 09:52:51 +02:00
Ming Tsay
08a23a8406 Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 97.8% (3146 of 3214 strings)

[CI skip]
 2016-04-11 09:52:49 +02:00
Michal Čihař
1cbfcfc7b0 Document antivirus proxy or addons breaking CSP 
This seems to be quite frequent question.

Issue #12133, #11835, #12119, #11579, #11845

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 09:52:35 +02:00
Madhura Jayaratne
1687d139af Do not hide indexes under a slider 
Fixes #12173

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-04-08 22:09:27 +10:00
Michal Čihař
568306622d Add link to Docker hub for image information 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-08 08:52:41 +02:00
Isaac Bennetch
015cabec48 Merge branch 'QA_4_6' 2016-04-07 15:08:43 -04:00
Isaac Bennetch
141c455d8f Minor grammar fix 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-04-07 14:59:30 -04:00
Michal Čihař
9d57ab4f2b Remove unused code 
This was used only in testsuite and quite some portion of tests existed
just to test this.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-07 09:51:49 +02:00
Michal Čihař
0227caf067 Adjust tests to new processing of password 
Issue #12147, #12143

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-07 09:47:34 +02:00
Michal Čihař
f4e16addb7 Merge remote-tracking branch 'origin/pull/12147' into tmp 2016-04-07 09:39:21 +02:00
Michal Čihař
f9ef2eb37e Improve performance with SkipLockedTables 
We now fetch all table status in one query, so this has pretty much same
speed as SkipLockedTables disabled.

Issue #12129

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-07 09:25:53 +02:00
Michal Čihař
338686589b Filter in use tables at MySQL server to improve performance on big servers 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-07 08:46:43 +02:00
Michal Čihař
e9386bc623 Adjust travis badge to svg 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 17:16:13 +02:00
Michal Čihař
53689f69d0 User more sensible spacing in structure tables 
Issue #12166

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 17:11:39 +02:00
Michal Čihař
ed63c261d8 More compact rendering of navigation tree 
The spacing is not really needed here.

Fixes #12166

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 17:02:13 +02:00
Michal Čihař
9f6a146e86 Merge branch 'QA_4_6' 2016-04-06 16:56:29 +02:00
Michal Čihař
5e965bedf3 Make upgrade warning a bit more descriptive 
Issue #12164

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 16:55:49 +02:00
Michal Čihař
16dc45bb9d Make warning a bit stronger 
Obviously users are doing this for ages and are surprised that the old
script doesn't work with new code.

Issue #12159

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 16:54:32 +02:00
Michal Čihař
e4cdd324d6 Merge branch 'QA_4_6' 2016-04-06 16:48:20 +02:00
Michal Čihař
0db84175b3 Update SQL parser to 95118e6db10c642a1d518e666c2aaed1b4991492 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 16:47:52 +02:00
Michal Čihař
ad4e55e0f7 Merge branch 'QA_4_6' 2016-04-06 16:04:51 +02:00
Michal Čihař
659c89e464 Update SQL Parser to 8de4749d803858859fcf7a39b1bbf058745920f0 
See #12165

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 16:04:35 +02:00
Michal Čihař
a5bcab5592 Make warning a bit stronger 
Obviously users are doing this for ages and are surprised that the old
script doesn't work with new code.

Issue #12159

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 15:18:42 +02:00
Michal Čihař
6d480f6791 Merge branch 'QA_4_6' 2016-04-06 14:06:37 +02:00
Michal Čihař
7de636d826 Fix PHP error if user did unpack new version over old one 
By doing stricter check on filename, we avoid old classes which break
autoloader.

Fixes #12159

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 14:05:49 +02:00
Michal Čihař
2c1b18a75b Merge branch 'QA_4_6' 2016-04-06 13:52:07 +02:00
Michal Čihař
7413208ce7 Merge pull request #12157 from nijel/ssl 
Simplify SSL setup
 2016-04-06 13:51:24 +02:00
Michal Čihař
e875d4b50b Adjust tracking test to new code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 11:58:20 +02:00