gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
108,997 Commits 12 Branches 481 Tags 2.4 GiB
29ce0ff602
Commit Graph

108997 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arif Budiman
29ce0ff602 Translated using Weblate (Indonesian) 
Currently translated at 70.3% (2247 of 3192 strings)

[CI skip]
 2017-03-18 18:45:45 +01:00
Michal Čihař
91a16c90c8 Fixed editing of rows with text primary key 
We do htmlspecialchars in PHP, so we should not URL de/encode here.

Fixes #13088

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-16 15:12:38 +01:00
Weblate
0f862dfab1 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-03-16 14:55:22 +01:00
Progyan Bhattacharya
f2e25bbf41 Translated using Weblate (Bengali) 
Currently translated at 73.4% (2343 of 3192 strings)

[CI skip]
 2017-03-16 14:55:18 +01:00
Michal Čihař
f50e3682f5 Delete only phpMyAdmin cookies on upgrade 
Fixes #12660

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-16 14:54:19 +01:00
Weblate
bc2266a9e7 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-03-15 16:18:35 +01:00
Володимир
7e7d3f45b0 Translated using Weblate (Ukrainian) 
Currently translated at 95.9% (3062 of 3192 strings)

[CI skip]
 2017-03-15 16:18:35 +01:00
Michal Čihař
8f640b9030 Do not point users to setup when it is disabled 
Fixes #13084

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-15 16:18:05 +01:00
Michal Čihař
49b497bd10 Changelog entry for #12708 and #13074 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-14 14:08:58 +01:00
Fenn-CS
2849c0cff8 Stripped PMA version from curl user-agent to increase consitency and security 
Signed-off-by: Fenn-CS <fenn25.fn@gmail.com>
 2017-03-14 14:08:36 +01:00
Володимир
c60da70ecd Translated using Weblate (Ukrainian) 
Currently translated at 96.0% (3067 of 3192 strings)

[CI skip]
 2017-03-14 14:07:20 +01:00
Weblate
79cd983170 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-03-14 13:29:22 +01:00
Володимир
45203ae951 Translated using Weblate (Ukrainian) 
Currently translated at 96.1% (3068 of 3192 strings)

[CI skip]
 2017-03-14 13:29:22 +01:00
Isaac Bennetch
58244de758 Adding composer lock for 4.7.0-rc1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-03-14 08:28:52 -04:00
Weblate
a4f13b2c3f Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-03-13 10:07:33 +01:00
Володимир
adfffb3081 Translated using Weblate (Ukrainian) 
Currently translated at 96.4% (3080 of 3192 strings)

[CI skip]
 2017-03-13 10:07:33 +01:00
Michal Čihař
fc777c99a8 Split documentation for ShowChgPassword, ShowCreateDb and ShowPhpInfo 
It really doesn't make much sense to have them all covered by one text.

Fixes #13069

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-13 10:06:25 +01:00
Michal Čihař
332899b968 Remove unused variable 
Introduced by pr #13053

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-13 09:58:03 +01:00
Michal Čihař
eccdb30ebb Changelog entry for #13053 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-13 09:56:28 +01:00
Raghuram
e54d5085d9 Fix broken links in setup page 
Signed-off-by: Raghuram Vadapalli<raghuram.vadapalli@research.iiit.ac.in>
 2017-03-13 09:55:31 +01:00
Weblate
a31c41dbcd Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-03-13 09:19:01 +01:00
Володимир
6fa7bbacd2 Translated using Weblate (Ukrainian) 
Currently translated at 96.5% (3081 of 3192 strings)

[CI skip]
 2017-03-13 09:19:01 +01:00
Michal Čihař
5d18e0bbe9 Changelog entry for #13054 and #13029 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-13 09:18:37 +01:00
Raghuram
ebc935a915 Fixes retrieving tables names from nested $table_list array in tracking 
Fixes #13029

Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
 2017-03-13 09:18:31 +01:00
Володимир
ddb772c95d Translated using Weblate (Ukrainian) 
Currently translated at 96.3% (3076 of 3192 strings)

[CI skip]
 2017-03-13 08:56:38 +01:00
Stefano Martinelli
ec5871b73e Translated using Weblate (Italian) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-03-13 08:36:29 +01:00
Pietro La Porta
aa1e32170a Translated using Weblate (Italian) 
Currently translated at 99.9% (3190 of 3192 strings)

[CI skip]
 2017-03-13 08:35:34 +01:00
Xavier Navarro
171a58cc8d Translated using Weblate (Catalan) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-03-12 23:03:38 +01:00
mao
59f4d3e92d Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-03-12 21:46:10 +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ř
7e82c9c40c Remove debugging code 
Fixes #13059

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-09 17:09:48 +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ř
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
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ř
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ř
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