gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,207 Commits 12 Branches 481 Tags 2.4 GiB
45d8dd39fa
Commit Graph

109207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Володимир
45d8dd39fa Translated using Weblate (Ukrainian) 
Currently translated at 96.3% (3078 of 3194 strings)

[CI skip]
 2017-03-13 08:57:04 +01:00
Stefano Martinelli
7c803ae898 Translated using Weblate (Italian) 
Currently translated at 100.0% (3194 of 3194 strings)

[CI skip]
 2017-03-13 08:57:02 +01:00
mao
77c8fc56dc Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3194 of 3194 strings)

[CI skip]
 2017-03-13 08:57:00 +01:00
Xavier Navarro
0b3195a6f1 Translated using Weblate (Catalan) 
Currently translated at 100.0% (3194 of 3194 strings)

[CI skip]
 2017-03-13 08:56:59 +01:00
dingo thirteen
5cc6856625 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3194 of 3194 strings)

[CI skip]
 2017-03-12 21:27:01 +01:00
Isaac Bennetch
b4c2d2988f Merge pull request #13063 from lem9/patch-2 
Update credits about Marc Delisle
 2017-03-12 12:43:34 -04:00
Weblate
2f19c37323 Merge remote-tracking branch 'origin/master' 2017-03-12 14:50:38 +01:00
Володимир
70fcd77ea8 Translated using Weblate (Ukrainian) 
Currently translated at 96.2% (3075 of 3194 strings)

[CI skip]
 2017-03-12 14:50:38 +01:00
Pietro La Porta
3a53db152f Translated using Weblate (Italian) 
Currently translated at 99.7% (3186 of 3194 strings)

[CI skip]
 2017-03-12 14:50:36 +01:00
F. E Noel Nfebe
77b39264b0 Fix #12984 : Show default collation when creating new DB (#13061) 
Added a default value for database collation dropdown

Fix #12984 

Signed-off-by: Fenn-CS <fenn25.fn@gmail.com>
 2017-03-12 19:20:28 +05:30
Marc Delisle
89030732fe Update credits about Marc Delisle 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2017-03-10 09:34:57 -05:00
Michal Čihař
a87108c96f Merge branch 'QA_4_7' 2017-03-10 11:49:44 +01:00
Michal Čihař
7524c85bad Merge remote-tracking branch 'origin/QA_4_7' 2017-03-10 11:49:41 +01:00
mao
b072897462 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 99.9% (3191 of 3194 strings)

[CI skip]
 2017-03-10 11:49:14 +01:00
Michal Čihař
e6a3b0eee8 Remove documentation for old MySQL server 
We're supporting 5.5 and newer, while this has been changed in 5.1.

Issue #13062

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-10 11:48:50 +01:00
mao
a1e9c87737 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 99.9% (3190 of 3192 strings)

[CI skip]
 2017-03-10 11:48:12 +01:00
Michal Čihař
4915fa44a1 Merge branch 'QA_4_7' 2017-03-09 17:09:56 +01:00
Michal Čihař
7e82c9c40c Remove debugging code 
Fixes #13059

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-09 17:09:48 +01:00
Michal Čihař
b1521ecadc Merge branch 'QA_4_7' 2017-03-09 16:30:41 +01:00
Michal Čihař
7569134132 Ignore folders only 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-09 16:30:37 +01:00
Michal Čihař
b96d783574 Ignore new themes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-09 16:29:35 +01:00
Michal Čihař
77e3458092 Merge branch 'QA_4_7' 2017-03-09 16:29:10 +01:00
Michal Čihař
efabbbc363 Merge commit '673e6cf56709980b49164eb21e63e6a5d661bf52' 2017-03-09 16:28:29 +01:00
Michal Čihař
89113241e6 Do keepalive calls for all authentication types 
We want to avoid session expiry in all cases, it makes no sense to limit
this to cookie auth only.

Issue #13022

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-09 16:27:41 +01:00
Isaac Bennetch
80eccb0a6b Update copyright years 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-03-08 11:04:44 -05:00
Isaac Bennetch
322aecaa8c Prepare for 4.7.0-rc1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-03-08 10:59:23 -05:00
Weblate
7835f725f3 Merge remote-tracking branch 'origin/master' 2017-03-08 15:43:22 +01:00
Chien Wei Lin
2e30bb3ee5 Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 99.8% (3190 of 3194 strings)

[CI skip]
 2017-03-08 15:43:19 +01:00
Isaac Bennetch
4011041d4f Merge branch 'QA_4_7' 2017-03-08 09:43:01 -05:00
Weblate
673e6cf567 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-03-08 15:42:14 +01:00
Chien Wei Lin
ef369eecd8 Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 99.9% (3190 of 3192 strings)

[CI skip]
 2017-03-08 15:42:12 +01:00
Isaac Bennetch
6d6dc81617 Fix small typo in function comment 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-03-08 09:41:36 -05:00
Isaac Bennetch
0b088f6790 Change defaults when exporting to Excel; now we include field/column names as the first row. 
This is always configurable via $cfg['Export']['excel_columns']

Fixes #12951

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-03-08 09:41:27 -05:00
Michal Čihař
2d8b8a8b60 Merge branch 'QA_4_7' 2017-03-06 14:50:57 +01:00
Michal Čihař
4312b16a54 Avoid using symlinks in certificate storage 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-06 14:50:40 +01:00
Michal Čihař
214a2b6b34 Rewrite SSL verification code for curl 
It seems that the curl extension is quite tricky what can be set. You
can not set both CURLOPT_CAINFO and CURLOPT_CAPATH. Unfortunately some
systems seem to have built in defaults for one of these which can not be
figured out of PHP. So let's just try the three options which make
sense.

Issue #12846

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-06 14:48:35 +01:00
Michal Čihař
3d24d08e41 Show system variables on error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-06 14:31:07 +01:00
Michal Čihař
b71371a913 Move certificates to separate directory 
- this makes it easier to manage
- overriding capath seems to have priority

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-06 14:13:59 +01:00
Michal Čihař
0a5b9de084 Try to debug test failure on Travis 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-06 13:56:58 +01:00
Michal Čihař
b89f568e1c Check whether setting options did succeed 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-06 13:50:05 +01:00
Michal Čihař
a6a917e262 Remove github from tests 
We no longer access it directly.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-06 13:42:48 +01:00
Michal Čihař
6ca6685ee0 Merge branch 'QA_4_7' 2017-03-06 13:07:28 +01:00
Michal Čihař
a011f987ee Merge remote-tracking branch 'origin/QA_4_7' 2017-03-06 13:07:24 +01:00
Michal Čihař
43148087bf Translated using Weblate (Czech) 
Currently translated at 93.5% (2987 of 3194 strings)

[CI skip]
 2017-03-06 13:07:03 +01:00
Michal Čihař
47863a25b5 Bundle ISRG Root X1 SSL certificate and use it for verification 
This way we avoid problems with misconfigured curl in some PHP
installations (WAMP), which has no trust certificates.

Fixes #12846

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-06 13:06:40 +01:00
Michal Čihař
3edb0d5df0 Fold configureCurl into httpRequestCurl 
There is no longer need to have it separate.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-06 13:00:34 +01:00
Michal Čihař
39f4b3dd40 Use our CDN for fetching git commit information 
We can avoid GitHub rate limiting this way as we do the requests from
the website backend and they are cached by CDN.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-06 12:54:52 +01:00
Michal Čihař
c1348b957a Translated using Weblate (Czech) 
Currently translated at 93.6% (2990 of 3192 strings)

[CI skip]
 2017-03-06 12:53:39 +01:00
tmtisfree
04c66a6fbe Translated using Weblate (French) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-03-05 15:45:02 +01:00
tmtisfree
6c325b8dcb Translated using Weblate (French) 
Currently translated at 100.0% (3194 of 3194 strings)

[CI skip]
 2017-03-05 15:44:55 +01:00