# By franck
# Via franck
* 'catalog' of https://github.com/thelia/thelia:
Impemented combination creation
# By Manuel Raynaud (29) and others
# Via gmorel (6) and others
* 'upload_management' of https://github.com/thelia/thelia: (52 commits)
Working : Upload image : Fix upload validation
- Image format allowed - manual-reverse order on image loop
Upload allow only for images
Hide upload zone during upload
Working : Upload image : Fix unit tests
Working : Upload image : set product image form loaded via ajax, fix category, folder, content
WIP : Upload image : set product image form loaded via ajax
Setting tinymce
Update uploader view Update image edit view
Working : Upload management : on content
Working : Upload management : on folder, category, product
cache dataccessfunctions
Working : Upload management : fix e.preventDefault in chrome and safari
Working : Image management set on Category
fire event on insert content in createmethod
fix issue, default foler is set on content creation
allow to create new content
update default param of content model
create content listener for crud management
dispatch event in pre/post crud method for content model
...
Conflicts:
templates/admin/default/product-edit.html
# By Manuel Raynaud (14) and Etienne Roudeix (1)
# Via Etienne Roudeix
* 'master' of https://github.com/thelia/thelia:
cache dataccessfunctions
fire event on insert content in createmethod
fix issue, default foler is set on content creation
allow to create new content
update default param of content model
create content listener for crud management
dispatch event in pre/post crud method for content model
display content modification page
create contentUpdateEvent
create contentCreateEvent
create ContentEvent
create contentModificationForm
create content controller
change folder_id parm by parent in list folder view
use placeholder in folder update route
