# By gmorel (24) and others
# Via gmorel (12) and others
* 'master' of https://github.com/thelia/thelia: (43 commits)
Working : upload file/image : fix sanitizeFileName
Working : images : enhance display
Working : Fix : Unit test
Working : Fix : Unit test
Working : Fix : Image Management + Document Management
Working : FileManager :Add some more unit tests
Working : Add a link on documents
Working : fix url document + refactor : naming conventions
Working : refactor : naming conventions
Working : upload : fix unit test
WIP : upload documents : add action, ctrl, event
Finished product combination basic function
WIP : upload document : add forms
Working : upload image : fix return URL to images tab
Working : upload image : fix fallback and delete links on refresh
Formatted combination table
Impemented combination creation
Working : Upload image : Fix upload validation
- Image format allowed - manual-reverse order on image loop
Upload allow only for images
...
Conflicts:
core/lib/Thelia/Model/Base/AttributeTemplate.php
core/lib/Thelia/Model/Base/AttributeTemplateQuery.php
core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php
install/faker.php
install/thelia.sql
local/config/schema.xml
templates/admin/default/assets/js/coupon.js
tests/functionnal/casperjs/exe/00_parameters.js
tests/functionnal/casperjs/exe/31_coupons_rule.js
9d02aa75a8