* 'coupon' of https://github.com/thelia/thelia:
# By Manuel Raynaud (10) and others
# Via Manuel Raynaud (3) and others
* 'master' of https://github.com/thelia/thelia: (27 commits)
AttributesAv management
update cart model
Using "update" instead of "change"
Finished admin controllers refactoriing
Created AbstractCrudController, and refactored existing controllers
Continuer attributes management
Change script file declaration order for bootstrap-editable fix
Delete form on the orders view
translate error message
- Creation of order-edit view
valid customer removal
pse ref in faker
pse ref
loop tests
test product loop limit
update customer general info
fix tests
product loop test
remove not needed flag in customer part
change method to retrieve data in customer create process
...
# By Manuel Raynaud (19) and others
# Via Manuel Raynaud (8) and others
* 'master' of https://github.com/thelia/thelia: (47 commits)
tax engine
tax engine
- Add orders view route - Add view & action for orders index
Removed a redondant "use"
Add tooltip
- Add creation address form - Add addresses list - Add update address form
Added process_assets config variable
Change breadcrumb separator color
Add breadcrumb to customers view
- Change boolean type to integer type for update_logged_in_user field - Create view for customer modification
syntax
use ROUTER::ABSOLUTE_URL by default
PSE loop todo
currency management in PSE loop
Add customer view finish
Add modal for create/delete customer
Update body background
fixed typo
searching route return relative path
pse loop currency
...
Conflicts:
core/lib/Thelia/Controller/Admin/CouponController.php
core/lib/Thelia/Core/Event/TheliaEvents.php
web/index_dev.php
