gmorel
19782f6852
Merge branch 'catalog' of https://github.com/thelia/thelia into upload_management
# By franck
# Via franck
* 'catalog' of https://github.com/thelia/thelia:
Finished combination creation GUI
Put curresncy selector in toolbar
Started price tab
Finished product multiple categories attachment
Ajaxified product modification tabs
Finished product features management
Aded feature_template and category_template position management
Finished product feature values
Fixed product update process
Added missing files
Working catalog branch
Conflicts:
core/lib/Thelia/Action/BaseAction.php
install/insert.sql
local/config/schema.xml
templates/admin/default/folders.html
templates/admin/default/product-edit.html