gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,971 Commits 12 Branches 481 Tags 2.4 GiB
892d09cf74
Commit Graph

104971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michal Čihař
4866f8a9e6 Remove support for Mozilla Prism 
This is dead project not supported upstream for years.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 14:32:14 +01:00
Michal Čihař
2a9fb73f92 Remove PmaAbsoluteUri from redirects 
This is no longer needed as per RFC 7231.

Issue #11412

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 14:32:14 +01:00
Michal Čihař
513e4503ba Forgotten changelog entry for ForceSSL removal 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 14:23:07 +01:00
Michal Čihař
6da017fcfc Load vendor_config just once at testsuite startup 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 14:21:57 +01:00
Michal Čihař
1e9e14d23b Remove ForceSSL configuration directive 
In most setups we simply do not have enough information to decide
whether user has come through HTTPS or not leading to infinite
redirects.

Anyway this is better to handle at web server side together with setting
HSTS headers.

Issue #11412, #11883

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 14:20:11 +01:00
flash1452
0d8085c070 Fix #11864 Move noSelect mehthod to makegrid.js 
Signed-off-by: Vishal Pandey <vishpandey2014@gmail.com>
 2016-02-03 14:06:51 +01:00
Michal Čihař
dc161e86f5 Merge remote-tracking branch 'origin/STABLE' 2016-02-03 14:03:06 +01:00
Michal Čihař
91d0655c8f Merge branch 'QA_4_5' 2016-02-03 13:58:08 +01:00
Weblate
616f7d5b94 Merge remote-tracking branch 'origin/master' 2016-02-03 13:57:18 +01:00
Παναγιώτης Παπάζογλου
393c5db84b Translated using Weblate (Greek) 
Currently translated at 100.0% (3216 of 3216 strings)

[CI skip]
 2016-02-03 13:57:15 +01:00
Michal Čihař
cd1d926a57 Remove unused variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 13:56:58 +01:00
Michal Čihař
c3e057b942 Remove unused parameters 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 13:56:15 +01:00
Michal Čihař
5883f14664 Remove unused variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 13:50:19 +01:00
Michal Čihař
ac9714cf6a Autoloading for phpseclib 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-01 21:53:53 +01:00
Weblate
ae28c3af64 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-02-01 21:46:51 +01:00
Michal Čihař
eb8ee811a4 Translated using Weblate (Czech) 
Currently translated at 95.8% (3078 of 3210 strings)

[CI skip]
 2016-02-01 21:46:50 +01:00
Michal Čihař
7b58acf62e Merge branch 'QA_4_5' 2016-02-01 21:46:33 +01:00
Michal Čihař
d7d01387bb Merge branch 'MAINT_4_5_4' into QA_4_5 2016-02-01 21:44:18 +01:00
Madhura Jayaratne
e98f63110c Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-02-01 23:46:38 +11:00
Madhura Jayaratne
4cb0c4cdf0 Avoid additional query for profiling support 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-01 23:19:49 +11:00
Madhura Jayaratne
3ad437b554 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-01 23:04:01 +11:00
Madhura Jayaratne
f4989760c0 More templating 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-01 20:31:56 +11:00
Madhura Jayaratne
4085ccd275 Use templating 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-01 19:55:02 +11:00
Madhura Jayaratne
fbed4c09bc Fix undefined error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-01 18:50:42 +11:00
Madhura Jayaratne
4d7597bd9b Make binary_logs an instance variable 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-01 18:21:26 +11:00
Madhura Jayaratne
04fd884d2a Use own dbi 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-01 18:13:39 +11:00
Madhura Jayaratne
51f3902f28 Use own response object 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-01 18:12:34 +11:00
Madhura Jayaratne
23d8a60da8 Introduce a controller for binary logs page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-01 17:40:35 +11:00
Weblate
18ad329497 Merge remote-tracking branch 'origin/master' 2016-02-01 07:20:21 +01:00
Michal Čihař
5f4a9398be Translated using Weblate (Czech) 
Currently translated at 94.5% (3040 of 3216 strings)

[CI skip]
 2016-02-01 07:20:18 +01:00
Madhura Jayaratne
fc899e45ec Remove server_modules page that is no longer used 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-01 17:20:00 +11:00
Deven Bansod
b1ddf58379 Merge branch 'QA_4_5' 2016-01-29 23:33:21 +05:30