merged 1.5.0 branch into 1.5.0-DB

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0-DB@8547 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ucorina 2011-06-29 15:36:09 +00:00
parent 4973c78fbc
commit 01d0925dd5
145 changed files with 990 additions and 31147 deletions

View file

@ -11,8 +11,8 @@
<action name="procFileImageResize" type="controller" standalone="true" />
<action name="procFileDelete" type="controller" standalone="true" />
<action name="procFileDownload" type="controller" standalone="true" />
<action name="procFileAdminDeleteChecked" type="controller" standalone="true" />
<action name="procFileAdminInsertConfig" type="controller" standalone="true" />
<action name="procFileAdminInsertModuleConfig" 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" />
</actions>
</module>