# By Etienne Roudeix
# Via Etienne Roudeix (2) and gmorel (2)
* 'master' of https://github.com/thelia/thelia:
pass container to thelialoop smarty plugin then to baseloop
* 'coupon' of https://github.com/thelia/thelia:
WIP - Coupon : ajax add
WIP - Coupon - unit test : no more fatal but some skipped/incomplete
WIP - Coupon - unit test : no more fatal but some fails
WIP - Coupon - add rule AJAX
# By Manuel Raynaud (79) and others
# Via gmorel (21) and others
* 'master' of https://github.com/thelia/thelia: (268 commits)
unit testing for tax engine calculator
tax in loops
remove test
Working - Add Symfony2 routing ability to Thelia router
finish simple list customer page in backoffice
Working - Fix #category-rule replaced by parser when writing jawascript
debug bar
mock getTotalAmoutn in order class
tax engine
escae output only if it's not an object
tax faker
insert 19.6 tva
create admin customer view and add output info in customer loop
update format smarty plugin
tax engine model
tax engine model
WIP - Coupon : add rule input ajax controller
create customer admin controller and index controller
clean some code
fix phpdoc
...
# By Etienne Roudeix (7) and Manuel Raynaud (7)
# Via Etienne Roudeix (2) and Manuel Raynaud (1)
* 'master' of https://github.com/thelia/thelia:
tax in loops
remove test
finish simple list customer page in backoffice
debug bar
mock getTotalAmoutn in order class
tax engine
escae output only if it's not an object
tax faker
insert 19.6 tva
create admin customer view and add output info in customer loop
update format smarty plugin
tax engine model
tax engine model
create customer admin controller and index controller
# By Etienne Roudeix (1) and others
# Via Etienne Roudeix (2) and Manuel Raynaud (2)
* 'master' of https://github.com/thelia/thelia:
clean some code
fix phpdoc
Added windows version of reset_install script
# 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
