Commit graph

109 commits

Author SHA1 Message Date
Kijin Sung
6ab309c8c4 Merge branch 'xpressengine/master' into develop
Conflicts:
	classes/context/Context.class.php
	classes/security/Purifier.class.php
	config/config.inc.php
	libs/phpmailer/phpmailer.php
	modules/admin/tpl/_header.html
	modules/admin/tpl/config_ftp.html
	modules/communication/communication.controller.php
	modules/layout/tpl/layout_modify.html
	modules/module/module.model.php
2016-02-18 20:01:52 +09:00
Kijin Sung
6b4d69bcc2 Remove old debug constants 2016-02-13 11:19:13 +09:00
Kijin Sung
343ad39b79 Add method to get real IP from CloudFlare headers 2016-02-02 09:30:00 +09:00
Kijin Sung
d3c0e94b03 Update minimal server requirements 2016-01-24 10:20:35 +09:00
Kijin Sung
ab92e76408 Move SSL-related Context constants to constants.php 2016-01-21 16:20:42 +09:00
Kijin Sung
a8094fe766 Refactor some URL related functions to use Rhymix constants 2016-01-20 15:45:18 +09:00
Kijin Sung
f38501fc25 Re-enable XE compatible debug constants 2016-01-19 14:20:21 +09:00
Kijin Sung
19ec92fc68 Do not define debug constants by default 2016-01-16 11:19:50 +09:00
Kijin Sung
f9dabb06f4 Move the autoloader, startup script, and functions to 'common' folder 2016-01-16 11:15:28 +09:00