# By Manuel Raynaud (11) and gmorel (1)
# Via Manuel Raynaud (3) and gmorel (3)
* 'master' of https://github.com/thelia/thelia:
Working - CasperJS : coupon rule
add missing files
finishing creating lost password template
start creating lost password template
add logo for beta version
change metadata for product part
update phpdebugbar dependency
add TimeDataCollector
just add Propel information in phpDebugBar
add some information in propelcollector
validate customer creation form
finish registration form
# By Manuel Raynaud (19) and others
# Via Manuel Raynaud (8) and others
* 'coupon' of https://github.com/thelia/thelia: (55 commits)
Working - add ajax loader
WIP - add tests casper JS on coupon
WIP - add tests casper JS on coupon
tax engine
tax engine
Working - add tests casper JS
- Add orders view route - Add view & action for orders index
Removed a redondant "use"
WIP - Coupon Add/Edit/Delete rule AJAX - add tests casper JS
WIP - Coupon Add/Edit/Delete rule AJAX - add tests casper JS
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
...
# 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
