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
..
conf	#346 일본어 번역 수정	2014-01-22 01:03:16 +09:00
faceoff	Connect everything as secure as possible.	2016-01-01 22:19:28 +09:00
lang	Convert all module lang files from XML to PHP	2016-01-31 16:01:17 +09:00
queries	Close Connection when there is no connection value.	2013-09-25 15:29:32 +00:00
ruleset	Close Connection when there is no connection value.	2013-09-25 15:29:32 +00:00
schemas	#18953798 : manage mobile layouts	2010-06-21 04:54:56 +00:00
tpl	Merge branch 'xpressengine/master' into develop	2016-02-18 20:01:52 +09:00
layout.admin.controller.php	Move remaining non-composer classes to common/libraries	2016-01-13 16:22:07 +09:00
layout.admin.model.php	#1047 레이이아웃 편집 시 layout.css 파일을 로드하지 못하는 문제 고침	2014-11-21 11:05:04 +09:00
layout.admin.view.php	#1047 레이이아웃 편집 시 layout.css 파일을 로드하지 못하는 문제 고침	2014-11-21 11:05:04 +09:00
layout.class.php	fix #424 중복 설정된 cache 설정 제거	2014-03-10 14:22:06 +09:00
layout.model.php	Fix incompatible signatures of inherited methods	2015-12-08 14:07:42 +09:00
layout.view.php	fix #1813 레이아웃 미리보기 동작에 CSRF/XSS 방어 및 embed URL에 'act' parameter 사용 제한	2015-12-08 15:11:55 +09:00