fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-30 07:42:11 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/xpressengine/xe-core (1.8.14)

Browse source 
Conflicts:
	classes/context/Context.class.php
	modules/point/tpl/config.html
This commit is contained in:
Kijin Sung 2015-12-02 14:38:23 +09:00
commit a22e69b7ec
59 changed files with 249 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/file/conf/module.xml
View file

@ -13,7 +13,7 @@
<action name="procFileImageResize" type="controller" ruleset="imageResize" />
<action name="procFileDelete" type="controller" />
<action name="procFileDownload" type="controller" method="GET|POST" />
<action name="procFileOutput" type="controller" />
<action name="procFileOutput" type="controller" method="GET|POST" />
<action name="procFileAdminDeleteChecked" type="controller" ruleset="deleteChecked" />
<action name="procFileAdminInsertConfig" type="controller" ruleset="insertConfig" />
<action name="procFileAdminInsertModuleConfig" type="controller" ruleset="fileModuleConfig" />

2
modules/file/tpl/adminConfig.html
View file

@ -56,3 +56,5 @@
</div>
</div>
</form>
<div class="admin-forum-container" data-chak-categories="XE설정:파일 업로드"></div>

2
modules/file/tpl/file_list.html
View file

@ -207,3 +207,5 @@ jQuery(function($){
});
});
</script>
<div class="admin-forum-container" data-chak-categories="XE설정:파일첨부"></div>