# 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
# By Manuel Raynaud (68) and others
# Via Manuel Raynaud (12) and others
* 'master' of https://github.com/thelia/thelia: (119 commits)
order tests
action order tests
cache dataccessfunctions
order action test
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
implement process for changing folder position
allow possibility to change folder visibility
...
Conflicts:
core/lib/Thelia/Coupon/CouponBaseAdapter.php
templates/admin/default/coupon-list.html
templates/admin/default/coupon-read.html
* 'coupon' of https://github.com/thelia/thelia:
# By Etienne Roudeix (17) and others
# Via Etienne Roudeix (9) and others
* 'master' of https://github.com/thelia/thelia: (52 commits)
fix content faker
fix typo and remove url generation in postInsert model
add covers annotation in ProductRewriteTest
create test for UrlRewritingTrait
payment loop
fix postage display
postage + invoice step
template is not mandatory in product table.
refactor rewrriten method name
Changed getDefaultCategory in getDefaultCategoryId
remove old model classes:
Working : Content : fix loop giving no elements
Working : Content : fix loop giving no elements
Added missing files...
Started product management
Working : Content : fix loop giving no elements
Working : Product : fix loop giving no elements
cart billing integration
empty cart or delivery exception
remove isntall routing and template
...
# By Etienne Roudeix (10) and franck (2)
# Via Etienne Roudeix (3) and franck (2)
* 'master' of https://github.com/thelia/thelia:
Polished categories related content
Finished category related content management
delivery process
delivery form
order delivery form
fix fixture dependant unit test
delivery process
delivery process
cart integration
cart integration
cart page
cart template
Conflicts:
install/faker.php
