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

105782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dingo thirteen
73e6f2098e Translated using Weblate (Dutch) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-04-13 17:41:58 +02:00
Weblate
bc44770cd6 Merge remote-tracking branch 'origin/master' 2016-04-13 14:46:58 +02:00
Giovanni Sora
aa87a058aa Translated using Weblate (Interlingua) 
Currently translated at 73.4% (2360 of 3211 strings)

[CI skip]
 2016-04-13 14:46:57 +02:00
Michal Čihař
cdcac304d2 Merge branch 'QA_4_6' 2016-04-13 14:46:46 +02:00
Michal Čihař
9ff296f841 Remove debugging code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-13 14:46:30 +02:00
Michal Čihař
e234747f67 Merge branch 'QA_4_5' into QA_4_6 2016-04-13 14:46:11 +02:00
Michal Čihař
3a981d165a Remove debugging code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-13 14:45:19 +02:00
Domen
78fc4a27b4 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-04-12 18:55:39 +02:00
Stefano Martinelli
4ac9a52557 Translated using Weblate (Italian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-04-12 12:03:10 +02:00
Kristjan Räts
67bc2a5311 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-04-12 11:46:20 +02:00
Michal Čihař
1cbc67c4b3 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-12 11:23:42 +02:00
Michal Čihař
518d0f5f7f Merge branch 'QA_4_6' 2016-04-12 11:23:19 +02:00
Ming Tsay
45395a6eee Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 98.1% (3153 of 3211 strings)

[CI skip]
 2016-04-12 11:22:38 +02:00
Weblate
680e04cc9e Merge remote-tracking branch 'origin/master' 2016-04-12 11:22:19 +02:00
Burak Yavuz
8918bd51a3 Translated using Weblate (Turkish) 
Currently translated at 99.9% (3211 of 3212 strings)

[CI skip]
 2016-04-12 11:22:18 +02:00
Παναγιώτης Παπάζογλου
9ae411300c Translated using Weblate (Greek) 
Currently translated at 100.0% (3212 of 3212 strings)

[CI skip]
 2016-04-12 11:22:16 +02:00
Michal Čihař
c0713308d9 Fix typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-12 11:21:27 +02:00
Kristjan Räts
8bb5a07428 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3212 of 3212 strings)

[CI skip]
 2016-04-12 11:05:13 +02:00
Burak Yavuz
5ad6f3825d Translated using Weblate (Turkish) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-04-11 21:45:28 +02:00
Weblate
47f182b506 Merge remote-tracking branch 'origin/master' 2016-04-11 18:54:44 +02:00
Burak Yavuz
2dbc3c35a9 Translated using Weblate (Turkish) 
Currently translated at 99.8% (3208 of 3212 strings)

[CI skip]
 2016-04-11 18:54:44 +02:00
dingo thirteen
6c89121646 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3212 of 3212 strings)

[CI skip]
 2016-04-11 18:54:42 +02:00
Michal Čihař
1a71b8502e Use null for non existing error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 18:54:33 +02:00
Weblate
9d9a6db49d Merge remote-tracking branch 'origin/master' 2016-04-11 18:32:22 +02:00
dingo thirteen
4b3b1b3864 Translated using Weblate (Dutch) 
Currently translated at 99.8% (3208 of 3212 strings)

[CI skip]
 2016-04-11 18:32:19 +02:00
Michal Čihař
00db766927 Remove unused function 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 18:31:56 +02:00
Michal Čihař
3dc44fd2fc Consistently return Message object as an error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 18:30:57 +02:00
Michal Čihař
267bf1e681 Close file in tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 18:29:54 +02:00
Michal Čihař
33cd6f3270 Add missing docs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 18:24:14 +02:00
Michal Čihař
32d360ece7 Check for fopen return value 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 18:20:41 +02:00
Michal Čihař
0b27b843eb We should use bytes for file length 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 18:03:38 +02:00
Michal Čihař
9145fc7dae Test reading of compressed files 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 18:03:05 +02:00
Michal Čihař
d4fdb95619 Adjust SHP file import to new code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 17:59:42 +02:00
Michal Čihař
29fe4d12af Check import status in testcase 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 17:52:35 +02:00
Michal Čihař
2c9deb0b62 Check zip file processing for errors 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 17:52:24 +02:00
Michal Čihař
bf2c76c1b1 Adjust tests to new import code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 17:40:56 +02:00
Michal Čihař
e068339e90 Fix import handle cleanup on error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 17:20:01 +02:00
Michal Čihař
e408163aed Improve performance of zip file import 
Avoid doing copies for every import chunk, rather use mb_strcut which
allows us to parse stream by bytes, but doesn't cut multibyte chars.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 17:17:28 +02:00
Michal Čihař
f90ca55a57 Add missing error check 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 17:10:38 +02:00
Michal Čihař
b4d53c1970 Bring back move uploaded file logic from old import code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 17:09:40 +02:00
Michal Čihař
b54e5b0c4b Use File class for file imports 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 17:09:40 +02:00
Michal Čihař
9182a4d3a1 Move error checking to the Config class 
Also fix not working checking error on the defaults.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 16:17:02 +02:00
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