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

105003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
ef7a16e1bd Merge commit '4f6fe19c30589425d92494747516994951ae2163' 2016-02-08 09:56:32 +01:00
Michal Čihař
1012004214 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-08 09:42:55 +01:00
Michal Čihař
475f936366 Setting version to 4.7.0-dev 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-08 09:42:29 +01:00
Michal Čihař
4f6fe19c30 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-08 09:38:28 +01:00
Michal Čihař
bf9bc710c2 Merge branch 'QA_4_5' into QA_4_6 2016-02-08 09:38:01 +01:00
Michal Čihař
10e11fe67d Replace define by using Config class 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-08 09:36:27 +01:00
Atul Pratap Singh
9e8bb3bef1 Merge pull request #11925 from zalog/master 
Search and replace with nothing
 2016-02-07 08:20:21 +05:30
Catalin Zalog
271e6d59d9 Search and replace with nothing 
Signed-off-by: Catalin Zalog <catalinzalog@yahoo.com>
 2016-02-07 04:15:32 +02:00
Stefano Martinelli
0a47d2a529 Translated using Weblate (Italian) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-02-06 12:44:44 +01:00
Pedro Moreira
4b096e6214 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.8% (2979 of 3210 strings)

[CI skip]
 2016-02-05 21:44:57 +01:00
Weblate
433bb7f6b4 Merge remote-tracking branch 'origin/master' 2016-02-05 01:43:45 +01:00
Stefano Martinelli
094f4b0675 Translated using Weblate (Italian) 
Currently translated at 100.0% (3216 of 3216 strings)

[CI skip]
 2016-02-05 01:43:44 +01:00
Isaac Bennetch
9324fde659 Small language improvement about HSTS 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-04 19:42:13 -05:00
Παναγιώτης Παπάζογλου
3205d145d5 Translated using Weblate (Greek) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-02-04 12:44:33 +01:00
Michal Čihař
22e5f4a4be Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 21:07:07 +01:00
Michal Čihař
a28cc6d2de Ensure we always restore original instance even on failure 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 20:41:00 +01:00
Michal Čihař
b846681c26 Correctly mock Response instance 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 20:30:07 +01:00
Michal Čihař
9bd4844c26 Do not skip test if IIS is defined 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 20:26:45 +01:00
Michal Čihař
1bddcff0d5 Remove accidental comment 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 20:22:49 +01:00
Michal Čihař
2148e7cad8 Implement test for Cookie auth without runkit 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 20:21:40 +01:00
Michal Čihař
be8b4ccd76 Add mising separator 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 19:57:42 +01:00
Weblate
0be1869339 Merge remote-tracking branch 'origin/master' 2016-02-03 19:56:44 +01:00
Pedro Moreira
8618600876 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.2% (2936 of 3216 strings)

[CI skip]
 2016-02-03 19:56:43 +01:00
Michal Čihař
e3843ab1a9 Test with SID if set 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 19:56:26 +01:00
Weblate
2402a0b053 Merge remote-tracking branch 'origin/master' 2016-02-03 19:49:18 +01:00
Pedro Moreira
5e0dc6b139 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.2% (2935 of 3216 strings)

[CI skip]
 2016-02-03 19:49:16 +01:00
Michal Čihař
c2b41b829a Wrap header() and headers_sent() in response 
This allows us to test the code without using runkit. Currenly only
AuthenticationHttp is migrated to new code, but others will follow.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 19:49:05 +01:00
Michal Čihař
ca9fbec4c2 Use newer phpunit (for withConsecutive) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 19:49:05 +01:00
Michal Čihař
431450a237 Make test run even without runkit 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 19:49:05 +01:00
Ayrton Fidélis
9d10b94303 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.0% (2928 of 3216 strings)

[CI skip]
 2016-02-03 19:38:39 +01:00
Pedro Moreira
ac61e4b78c Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.0% (2928 of 3216 strings)

[CI skip]
 2016-02-03 19:31:50 +01:00
Michal Čihař
db6af1be82 Simplify code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:57:19 +01:00
Michal Čihař
892d09cf74 Add more tests for getting cookie path 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:50:00 +01:00
Michal Čihař
ae1ccf3e6a Remove PmaAbsoluteUri configuration directive 
Fixes #11412

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:41:29 +01:00
Michal Čihař
43ca165e9f Remove unused method checkCookiePath 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:34:32 +01:00
Michal Čihař
a569eeca93 Do not use PmaAbsoluteUri for getCookiePath 
Issue #11412

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:32:32 +01:00
Michal Čihař
060aaf9c99 Remove detectHttps method 
The isHttps method does the same and simpler.

Issue #11412

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:25:58 +01:00
Michal Čihař
a913f99817 Add detection based on REQUEST_URI as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:25:13 +01:00
Michal Čihař
751c958e57 Postpone https check to time when it's needed 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:19:59 +01:00
Michal Čihař
49eb80d887 Rewrite tests for https detection 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:19:04 +01:00
Michal Čihař
16a30ae87d Fix documented return values 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:15:40 +01:00
Michal Čihař
41c25ca10b Fix number comparing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:15:21 +01:00
Michal Čihař
218ece6dc0 Make isHttps independent of PmaAbsoluteUri 
Issue #11412

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:07:04 +01:00
Michal Čihař
8f17813535 Visualization now works even on HTTPS 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 15:18:49 +01:00
Michal Čihař
73e01ba665 Use HTTPS when accessing openstreetmap tile server 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 15:17:26 +01:00
Michal Čihař
6238010e7d Use verbatim OpenLayers.js 
... and customize it on init.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 15:11:24 +01:00
Michal Čihař
41ab867fb7 Use builtin OpenLayers OSM setup 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 15:07:47 +01:00
Michal Čihař
86daa8f474 Update OpenLayers to 2.13.1 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 14:57:50 +01:00
Michal Čihař
6e78a2c66f Remove OpenStretMap.js from OpenLayers.js, we ship it separately 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 14:43:02 +01:00
Michal Čihař
c01e32b3c5 Remove PmaAbsoluteUri from javascript params, not used there 
Issue #11412

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 14:33:42 +01:00