# By Manuel Raynaud (19) and others
# Via Manuel Raynaud (7) and others
* 'master' of https://github.com/thelia/thelia: (29 commits)
feed loop is now countable
Change error page design
Add validation button on form
- Edit country view creation - Delete and edit modalbox creation - Countries routes management
Completed template management
fix faker
fix faker script
Working : Fixture : cleaning
debugbar log query also use Tlog
update CartAdd form
Working : Fixture : cleaning
Working : Coupon : Fix unit tests @todo refactor
force charset in sql files
Countries view and routing creation
save if producSaleElements is in promo or not
Finished Features management
add promo column in cart_item
dispatch event when default currency change
add return statement in clear cache method
create cache for config entity
...
# By Manuel Raynaud (19) and others
# Via Manuel Raynaud (5) and others
* 'master' of https://github.com/thelia/thelia: (37 commits)
add PropelDataCollector to debugbar, still missing some informations
remove unused class
integrate debugbar module
remove htmlpurifier
modify insert.sql including debugBar module
add new event and new tag
Started category modification
Factorized modal dialogs javascript
Factorized creation and confirmation modal dialogs
create controller adding delivery module in session
create Delivery loop
Working :
Continuing categories administration...
Working :
create base loop for delivery and payment entities
remove htmlpurifier dependency
country id can be an argument for calculate method
Working :
Working :
fix typo
...
Conflicts:
composer.lock
core/lib/Thelia/Controller/Admin/CategoryController.php
templates/admin/default/assets/less/thelia/variables.less
