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

105294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
9ae4bd59cd Add shared code for testing class availability 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:03:19 +01:00
Michal Čihař
38482bfa9f Use Componser autloader for external libraries 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:03:19 +01:00
Michal Čihař
d6981ebe81 Additional dependencies for composer 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:03:19 +01:00
Michal Čihař
39d948d610 Add changelog entry for Swekey removal 
Fixes #11981

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 07:58:41 +01:00
Michal Čihař
2fffee3093 Merge remote-tracking branch 'origin/pull/11986' 2016-02-22 07:56:50 +01:00
chintan zaveri
2b74163914 Removal of Swekey 
Signed-off-by: Chintan Zaveri <zaveri_chintan@rediff.com>

master rebased

Signed-off-by: Chintan Zaveri <zaveri_chintan@rediff.com>
 2016-02-20 21:41:07 +05:30
Isaac Bennetch
59a48786e2 Merge branch 'QA_4_6' 2016-02-19 21:35:49 -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
058ad66f73 Merge branch 'QA_4_6' 2016-02-19 21:17:07 -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
fec3043754 Merge branch 'QA_4_6' 2016-02-19 21:43:03 +05:30
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ř
7a9a580290 Merge branch 'QA_4_6' 2016-02-19 13:34:13 +01:00
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
Madhura Jayaratne
3364cd3f27 Improve method names 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-19 23:04:21 +11:00
Madhura Jayaratne
d4ad18e630 Remove debugging code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-19 23:00:51 +11:00
Madhura Jayaratne
4a8320aac4 Add doc comments 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-19 22:56:30 +11:00
Madhura Jayaratne
ddf847a5eb Align docs 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-19 22:54:18 +11:00
Madhura Jayaratne
af6dc40d30 Add missing doc comments 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-19 22:51:14 +11:00
Madhura Jayaratne
e1f55f4d9c Fix alignment in doc comments 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-19 22:43:10 +11:00
Madhura Jayaratne
37cf811f36 Add missing parameter in doc comment 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-19 22:41:18 +11:00
Madhura Jayaratne
6f547b5d9a Remove superfluous white spaces 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-19 22:38:56 +11:00
Madhura Jayaratne
0226429e73 Merge branch 'QA_4_6' 2016-02-19 19:43:13 +11: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
7c2e371b70 Merge remote-tracking branch 'origin/master' 2016-02-19 09:29:23 +01:00
Adam Magnier
63bd9b8468 Translated using Weblate (French) 
Currently translated at 99.9% (3209 of 3211 strings)

[CI skip]
 2016-02-19 09:29:20 +01:00
Madhura Jayaratne
2ff57f5d36 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-02-19 19:28:38 +11:00
Madhura Jayaratne
880ae963f1 Organize db search page in criteria, results, browse results order 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-19 19:27:13 +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ř
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