# 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 (60) and others
# Via Manuel Raynaud (16) and others
* 'master' of https://github.com/thelia/thelia: (113 commits)
implement process for changing folder position
allow possibility to change folder visibility
allow to create folder
add dispatcher before/after for folder crud management
icreate folder delete event
process folder update action
create folder events
display info in folders edition template
push model
re-add home link in menu
comment dev menu in layout
translate some missing string
fixes order integration
order process
change some informations in layou
fix query in Thelia\Model\Folder::countAllContents
allow to order products on category page
Add default language & editing language default field
Vertical align middle tables
Fixed translations
...
Conflicts:
core/lib/Thelia/Tools/I18n.php
templates/admin/default/category-edit.html
# By franck (6) and others
# Via franck (3) and others
* 'master' of https://github.com/thelia/thelia:
Implemented "Remember Me" feature on admin. Started template management
Added Templates events
First version of installation wizard
tax engine retriever
allow address removal from front
Insert pagination inside tfoot
allow update customer address in front tempalte
allow to create a new address
allow to make an address as default on update action
Finished attributes management
Fixed action column alignment
Fixed duplication parameter check regexp
absoluteUrl prevetn duplicate parameters in generated URL
