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

100 Commits

Author SHA1 Message Date
Michal Čihař
941e861aba Define major version 
This will be later used as compatiblity check for themes.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-15 09:47:15 +02:00
Michal Čihař
bb26e2e0d9 Remove deprecated variables 
These should not be used for few years.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-15 09:47:15 +02:00
Michal Čihař
ae9006e9be Use one temporary directory 
Share one directory for Twig cache, SHP import and file uploads.

The code now also validates the cache directory and creates it on the
fly, so it properly detects if the directory can not be used.

Also the documentation has been improved to document securing this
directory.

Fixes #13225
Fixes #13226

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-05 11:08:36 +02:00
Michal Čihař
6ca6685ee0 Merge branch 'QA_4_7' 2017-03-06 13:07:28 +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ř
68c5cef0d5 Merge branch 'QA_4_7' 2017-03-02 15:30:20 +01:00
Artem Hryn
6014898779 Include 100% font size in the selection 
Fixes #13028

Signed-off-by: Artem Hryn <plartem01@gmail.com>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-02 15:30:10 +01:00
Michal Čihař
161f0d6418 Merge branch 'QA_4_7' 2017-02-14 11:54:08 +01:00
Michal Čihař
8767499594 Avoid using ARRAY_FILTER_USE_KEY 
As these are not supported on PHP 5.5 and HHVM.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-14 10:50:03 +01:00
Michal Čihař
600373e9ba Avoid messing up with configuration values having / in keys 
This confuses user configuration as it does use these values while rest
of the code does not. So the setting appears to be active while it does
not actually work.

Fixes #12832

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-14 10:19:45 +01:00
Isaac Bennetch
2a989a23bb Prepare for 4.8.0-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-25 23:12:48 -05:00
Isaac Bennetch
62c6e73cc5 Prepare for 4.7.0-beta1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-25 19:25:29 -05:00
Michal Čihař
945e615253 Merge branch 'QA_4_6' 2016-12-19 15:23:31 +01:00
Michal Čihař
7d361806c3 Share code for rendering custom header and footer 
Fixes #12802

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-19 15:20:12 +01:00
Michal Čihař
b758e59bc4 Merge branch 'QA_4_6' 2016-11-28 11:30:28 +01:00
Michal Čihař
10caf5bcae Check if variables are set prior to use 
Issue #12713

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 11:30:14 +01:00
Isaac Bennetch
c1acb3a212 Prepare for 4.6.6-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-11-26 08:01:00 -05:00
Isaac Bennetch
9970d9d32e Release 4.6.5.1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-11-25 22:36:14 -05:00
Isaac Bennetch
b1136b88b1 Prepare for 4.6.6-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-11-25 01:16:37 -05:00
Isaac Bennetch
5daee71272 4.6.5 release and ChangeLog 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-11-24 11:02:33 -05:00
Michal Čihař
82158f4c48 Merge branch 'QA_4_6' 2016-10-04 12:02:07 +02:00
Michal Čihař
ddf580c51b Fix OmniWeb version match (issue #12615) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-04 12:02:02 +02:00
Michal Čihař
1a23eccd2b Remove code for MSIE 6 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-04 12:01:27 +02:00
Michal Čihař
7f35b62c06 Merge branch 'QA_4_6' 2016-10-04 11:51:46 +02:00
Michal Čihař
cd4c8374b1 Fixed regexp for matching browser versions 
Fixes #12615

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-04 11:51:29 +02:00
Michal Čihař
3546bed47e Avoid using mb_strlen for checking whether string is empty 
Using strlen produces same results here, just way faster.

Fixes #12397

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 10:29:21 +02:00
Michal Čihař
47a0b7edd5 Hardcode connection timeout settings 
We anyway used almost same value in all places.

While doing this change, I've also increased the timeout.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 11:35:52 +02:00
Michal Čihař
a7755dbb64 Merge pull request #12465 from Seldar/master 
Fixes #12380 Refactored http requests into one function "httpRequest" in Util.php
 2016-08-29 11:08:12 +02:00
Volkan Ulukut
be6944d0eb
Fixes #12380 Refactored http requests into one function "httpRequest" in Util.php 
Signed-off-by: Volkan Ulukut <arthan@gmail.com>
 2016-08-29 00:20:38 +03:00
Michal Čihař
87f4e954d1 Merge branch 'QA_4_6' 2016-08-25 14:57:30 +02:00
Michal Čihař
26cc80324e Validate git commit hash before using 
Just to ensure we've parsed correct data.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-25 14:56:41 +02:00
Michal Čihař
23e01d306a Merge branch 'QA_4_6' 2016-08-17 15:38:22 +02:00
Michal Čihař
7898060916 Ensure PmaAbsoluteUri ends with / 
This was probably most frequest user error we want to fix.

Issue #12374

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 15:37:20 +02:00
Michal Čihař
a458b70412 Use PmaAbsoluteUri for isHttps 
Issue #12374

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 15:35:15 +02:00
Michal Čihař
01b9db6b1c Rename getCookiePath() to getRootPath() 
It is not used only for cookies, so generic name makes more sense.

Issue #12374

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 15:35:15 +02:00
Michal Čihař
83476322ba Use PmaAbsolueUri for cookie path 
Issue #12374

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 15:35:15 +02:00
Isaac Bennetch
b3d8ebad3f Prepare for 4.6.5 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-08-16 21:35:34 -04:00
Isaac Bennetch
b9a6a9993e Release 4.6.4 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-08-16 16:38:46 -04:00
Michal Čihař
a2e6c78fb7 Use https for outbound links where applicable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-28 09:41:52 +02:00
Michal Čihař
2f247ea461 Merge branch 'QA_4_6' 2016-07-26 16:07:01 +02:00
Michal Čihař
53af6a5699 Simplify session handling on possibly long requests 
We really do not have to reconfigure sessions on restarting them.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-26 16:04:56 +02:00
Isaac Bennetch
58534ce2fc Prepare for 4.6.4-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-23 02:40:42 -04:00
Isaac Bennetch
f2db92434b Fix merge conflicts 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-23 00:28:35 -04:00
Isaac Bennetch
4f57305eab Release 4.6.3 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-23 00:27:15 -04:00
Michal Čihař
791bdafcdd Merge branch 'QA_4_6-security' into master-security 2016-06-17 16:24:39 +02:00
Michal Čihař
1363ce5749 Merge branch 'QA_4_6' into QA_4_6-security 2016-06-17 14:27:02 +02:00
Michal Čihař
81e72439b6 Merge branch 'QA_4_6' 2016-06-17 14:00:15 +02:00
Michal Čihař
07216c9b8e Ensure that connection collation contains no HTML 
There is currently no MySQL collation which would do that, but just to
be safe.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 13:58:26 +02:00
Michal Čihař
27caf5b46b Improve detection of script name 
In case PHP_SELF was not set by server, we used REQUEST_URI, which might
embed PATH_INFO as well. However we really need to know the path without
it, so let's strip it as well.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 09:35:56 +02:00
Michal Čihař
ab29ec9947 Merge branch 'QA_4_6' 2016-05-27 11:12:58 +02:00