merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -8,9 +8,10 @@
<action name="getFileList" type="model" standalone="true" />
<action name="procFileUpload" type="controller" standalone="true" />
<action name="procFileIframeUpload" type="controller" standalone="true" />
<action name="procFileImageResize" type="controller" standalone="true" />
<action name="procFileImageResize" type="controller" standalone="true" ruleset="imageResize" />
<action name="procFileDelete" type="controller" standalone="true" />
<action name="procFileDownload" type="controller" standalone="true" />
<action name="procFileDownload" type="controller" standalone="true" method="GET|POST" />
<action name="procFileOutput" type="controller" standalone="true" />
<action name="procFileAdminDeleteChecked" type="controller" standalone="true" ruleset="deleteChecked" />
<action name="procFileAdminInsertConfig" type="controller" standalone="true" ruleset="insertConfig" />
<action name="procFileAdminInsertModuleConfig" type="controller" standalone="true" ruleset="fileModuleConfig" />