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

105255 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
7ae0342b81 Merge branch 'QA_4_6' 2016-02-18 10:54:03 +01:00
Michal Čihař
f3f63f189b Merge commit '82190f978a905c0227514a4c04d2356cd293573a' 2016-02-18 10:54:01 +01:00
Michal Čihař
4a402c3542 Use correct markup for options removal 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-18 10:52:56 +01:00
Michal Čihař
9bdca83305 Improve LanguageManager tests 
- test for MySQL locale on locale we have complete enough coverage
- add test for getting non existing locale

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-18 10:49:17 +01:00
Michal Čihař
e4b5ef5a17 Remove obsolete test files 
These are not working for ages, so I assume nobody needs them :-).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-18 09:34:21 +01:00
Weblate
148026d4d2 Merge remote-tracking branch 'origin/master' 2016-02-18 08:28:58 +01:00
Burak Yavuz
01dd0b2e44 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-02-18 08:28:58 +01:00
Domen
077af2a7df Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-02-18 08:28:57 +01:00
Giovanni Sora
95ac952575 Translated using Weblate (Interlingua) 
Currently translated at 73.5% (2362 of 3211 strings)

[CI skip]
 2016-02-18 08:28:56 +01:00
Παναγιώτης Παπάζογλου
3ed07c644e Translated using Weblate (Greek) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-02-18 08:28:55 +01:00
Marc-Antoine Thevenet
f73a98d2ae Translated using Weblate (French) 
Currently translated at 99.9% (3208 of 3211 strings)

[CI skip]
 2016-02-18 08:28:55 +01:00
Kristjan Räts
cf54f11a96 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-02-18 08:28:54 +01:00
dingo thirteen
c93381446a Translated using Weblate (Dutch) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-02-18 08:28:54 +01:00
Michal Čihař
89c3c789d8 Translated using Weblate (Czech) 
Currently translated at 94.4% (3036 of 3214 strings)

[CI skip]
 2016-02-18 08:28:54 +01:00
Michal Čihař
3d0b33b32f Add templates for new issues and pull requests 
See https://github.com/blog/2111-issue-and-pull-request-templates

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-18 08:28:15 +01:00
Burak Yavuz
82190f978a Translated using Weblate (Turkish) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-02-17 19:14:40 +01:00
Domen
b867cca62d Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-02-17 17:14:49 +01:00
dingo thirteen
b5edfaaf73 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-02-17 16:24:39 +01:00
Kristjan Räts
cbbbe477b0 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-02-17 13:22:07 +01:00
Παναγιώτης Παπάζογλου
e275690dc4 Translated using Weblate (Greek) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-02-17 12:54:42 +01:00
Michal Čihař
b3a2b74aa4 Merge branch 'QA_4_6' 2016-02-17 12:13:22 +01:00
Michal Čihař
35dae12574 Define cell_align_left for tests 
It's defined early in common.inc.php so it's always available.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 12:12:49 +01:00
Michal Čihař
4de7b648d2 Merge branch 'QA_4_6' 2016-02-17 12:04:03 +01:00
Michal Čihař
c60f97331a Avoiud displaying query without message 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 12:03:55 +01:00
Michal Čihař
131af0b58c Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:57:25 +01:00
Michal Čihař
96246a9582 Merge branch 'QA_4_6' 2016-02-17 11:57:02 +01:00
Michal Čihař
32e2b1f4fe Merge commit 'f97c3081fe9673b8945d75df2a37af81e0667e4f' 2016-02-17 11:56:59 +01:00
Michal Čihař
1f26e89579 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:56:15 +01:00
Michal Čihař
f97c3081fe Add missing include 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:55:54 +01:00
Michal Čihař
3eb84188f4 Merge branch 'QA_4_6' 2016-02-17 11:54:53 +01:00
Michal Čihař
a14e0af554 Simplify and improve message about listing bookmarks 
The string concatenation makes it really poor for translating, usually
leading to sentences which do not make sense.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:53:17 +01:00
Michal Čihař
52fa4e1042 Merge branch 'QA_4_6' 2016-02-17 11:49:56 +01:00
Michal Čihař
99ba940ed0 Correct gender for bookmarks 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:49:49 +01:00
Michal Čihař
45ba46d742 Merge branch 'QA_4_6' 2016-02-17 11:40:53 +01:00
Michal Čihař
ed44120194 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:40:16 +01:00
Michal Čihař
7407d4931c Merge branch 'QA_4_6' 2016-02-17 11:39:39 +01:00
Michal Čihař
0a2facdfe9 Properly use plural for message with number of queries 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:39:16 +01:00
Michal Čihař
cd0e1000a8 Merge branch 'QA_4_6' 2016-02-17 11:37:35 +01:00
Michal Čihař
6d33a475eb Fixed rendering of messages without SQL query 
It should get rounded boxes at bottom, but didn't get it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:37:02 +01:00
Michal Čihař
a411cd0ca4 The cell_align_left is defined in common.inc.php so it should available in all cases 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:35:36 +01:00
Michal Čihař
f1379e2b26 Merge branch 'QA_4_6' 2016-02-17 11:33:02 +01:00
Michal Čihař
8bf212f6c3 Avoid displaying import query twice 
Fixes #11907

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:32:22 +01:00
Michal Čihař
dd09116716 Correct fix for table import processing 
We need to consistently propagate the $sql_data array.

Issue #11850

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:12:08 +01:00
Michal Čihař
5563f3e137 Revert "Remove sql data parameter" 
This reverts commit 84c12c2fdd.
 2016-02-17 10:59:40 +01:00
Michal Čihař
855145988c Revert "Always use local static storage of executed queries" 
This reverts commit ee8f9b0dba.
 2016-02-17 10:59:37 +01:00
Michal Čihař
2670a1499f Merge branch 'QA_4_6' 2016-02-17 10:52:55 +01:00
Michal Čihař
18f9231d74 Fixed CSV import 
Fixes #11850

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 10:52:34 +01:00
Michal Čihař
6895a1fc6e Revert "fix_11907" 
This reverts commit bfe30d1261.

It removes the message in many cases where it should be shown.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 10:49:01 +01:00
Michal Čihař
ee8f9b0dba Always use local static storage of executed queries 
Issue #11850

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 10:46:23 +01:00
Michal Čihař
84c12c2fdd Remove sql data parameter 
This just makes the SQL import different from others leading to subtle
breakages.

Issue #11850

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 10:42:14 +01:00