# 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
# 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
# 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
# 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
