TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/thelia/thelia

Browse Source 
Conflicts:
	templates/admin/default/category-edit.html
This commit is contained in:
franck
2013-09-19 17:27:46 +02:00
parent 05aa284f4b 2f4904e704
commit e672677748
46 changed files with 3836 additions and 2403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Thelia/Config/Resources/routing/admin.xml
View File

@@ -174,6 +174,10 @@
<requirement key="_format">xml|json</requirement>
</route>
<route id="admin.products.update-accessory-position" path="/admin/products/update-accessory-position">
<default key="_controller">Thelia\Controller\Admin\ProductController::updateAccessoryPositionAction</default>
</route>
<!-- Folder routes management -->
<route id="admin.folders.default" path="/admin/folders">