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

105168 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
2ebabd11fd Merge branch 'QA_4_5' into QA_4_6 2016-02-29 12:13:45 +01:00
Michal Čihař
88e0944cfd Honor vendor configuration for gettext inclusion 
Fixes #12048

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-29 12:12:34 +01:00
Weblate
19c7a069c7 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-02-26 03:28:05 +01:00
Ray Santos
19308231b3 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.2% (2962 of 3211 strings)

[CI skip]
 2016-02-26 03:28:05 +01:00
Andre Evertz
f825abc8a7 Fix for wrong mysql_upgrade message on Users tab with Percona Server >= 5.7 
Signed-off-by: Andre Evertz <andre.evertz@devil-coding.de>
 2016-02-26 13:26:35 +11:00
Michal Čihař
33f0b947db Merge branch 'QA_4_5' into QA_4_6 2016-02-25 12:30:42 +01:00
Michal Čihař
1297747a65 Fixed incorrect usage of SQL parser context in SQL export 
Fixes #12029

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-25 12:29:34 +01:00
Michal Čihař
57607e062b Add changelog for SQL parser update 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-25 12:28:24 +01:00
Michal Čihař
5fb33a7af4 Merge commit '2b1a68cc4eb935ef3df5c7401d0d1338df09bc72' into MAINT_4_5_5 2016-02-25 12:25:07 +01:00
Michal Čihař
9702259f81 Merge remote-tracking branch 'security/MAINT_4_5_4-security' into MAINT_4_5_5 2016-02-25 08:55:45 +01:00
Michal Čihař
67c5514e65 Merge branch 'MAINT_4_5_4' into MAINT_4_5_4-security 2016-02-25 08:53:52 +01:00
Dan Ungureanu
70e326deb9 Added changelog entries. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2016-02-24 20:56:33 +02:00
Dan Ungureanu
90605cc9a8 Merge branch 'QA_4_5' into QA_4_6 2016-02-24 20:48:14 +02:00
Dan Ungureanu
2b1a68cc4e Updates sql-parser to phpmyadmin/sql-parser@5c489d91f5 (v3.4.0). 
Fixes #11971. CREATE UNIQUE INDEX index type is not recognized by parser.
Fixes #11982. Row count wrong when grouping joined tables.
Fixes #12012. Column definition with default value and comment in CREATE TABLE expoerted faulty.
Fixes #12020. New statement but no delimiter and unexpected token with REPLACE.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2016-02-24 20:41:54 +02:00
Weblate
968edb64bd Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-02-24 14:41:34 +01:00
Yury Vidal
18de5389b9 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.1% (2960 of 3211 strings)

[CI skip]
 2016-02-24 14:41:33 +01:00
Michal Čihař
7ca6299093 Merge branch 'QA_4_5' into QA_4_6 2016-02-24 14:39:39 +01:00
Stefano Martinelli
4450a44d54 Translated using Weblate (Italian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-02-22 22:09:10 +01:00
Isaac Bennetch
4b3c91b0f5 Version 4.5.5 release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-22 09:56:51 -05:00
Isaac Bennetch
2e26e33671 Archive old changelog entries 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-22 09:53:25 -05:00
Isaac Bennetch
386c4bef20 Document Isaac as the new release manager 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-22 09:50:14 -05:00
Isaac Bennetch
4dbbf2317d Merge branch 'QA_4_5' into QA_4_6 2016-02-19 21:34:07 -05:00
Isaac Bennetch
fe5c54fadf Improve GPG examples using Isaac's key 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-19 21:30:11 -05:00
Isaac Bennetch
848153628a Minor language improvements in documentation 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-19 21:16:40 -05:00
Atul Pratap Singh
d4897436d9 Rephrase and reposition the error report submission form 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-02-19 21:19:42 +05:30
Michal Čihař
fbf756c7d6 Merge branch 'QA_4_5' into QA_4_6 2016-02-19 13:33:56 +01:00
Michal Čihař
47ff669fdc Changelog entry for #11979 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-19 13:33:14 +01:00
Michal Čihař
968232a19d Merge pull request #11980 from madhuracj/bug11979 
Fix #11979 DECLARE not accepted as valid SQL
 2016-02-19 13:32:31 +01:00
Weblate
969e16858b Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-02-19 09:37:22 +01:00
Adam Magnier
26c79f7607 Translated using Weblate (French) 
Currently translated at 99.9% (3209 of 3211 strings)

[CI skip]
 2016-02-19 09:37:21 +01:00
Madhura Jayaratne
8428cd714a Fix SQL syntax highlighting in database search page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-19 19:36:58 +11:00
Weblate
fa385aa23b Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-02-18 10:54:18 +01:00
Giovanni Sora
e6ca1ee5d2 Translated using Weblate (Interlingua) 
Currently translated at 73.5% (2364 of 3213 strings)

[CI skip]
 2016-02-18 10:54:17 +01:00
Marc-Antoine Thevenet
28119247c1 Translated using Weblate (French) 
Currently translated at 99.9% (3208 of 3211 strings)

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

[CI skip]
 2016-02-18 10:54:16 +01:00
Michal Čihař
9a15dd457c Translated using Weblate (Czech) 
Currently translated at 94.4% (3032 of 3211 strings)

[CI skip]
 2016-02-18 10:54:16 +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
Madhura Jayaratne
176d63f108 Fix #11979 DECLARE not accepted as valid SQL 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-18 15:55:56 +11: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ř
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ř
c60f97331a Avoiud displaying query without message 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 12:03:55 +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ř
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ř
99ba940ed0 Correct gender for bookmarks 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:49:49 +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