# 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
# By Manuel Raynaud (22) and others
# Via Manuel Raynaud (7) and others
* 'master' of https://github.com/thelia/thelia: (32 commits)
refactor name for updating actions
choose UPDATE word for name actions
add update address action and create tests
404 not found management
Working Fix unset namespace
modify travis script
test rewriting exception
Fixed minor bug in Currencies
Finished currency edition
Added route methods
address action implementation
hot fix
rewriting
add address create controller and event
Added AdminUtilities Smarty plugin, optimized templates
update customer model createOrUpdate method
update address model
fix redirect process in viewListener
refactor reset_install script
refactor install process, database management in dedicated class
...
Conflicts:
local/config/schema.xml
reset_install.sh
# By Manuel Raynaud (8) and franck (2)
# Via franck
* 'master' of https://github.com/thelia/thelia:
en_EN -> en_UK, the "en_EN" locale does not exists.
Smarty inheritance in admin template.
fix typo in phpdoc
complete test for foramt_number smarty function
test foramt_date without datetime object
create foramt_number smarty function
remove sqlmap file
add some phpdoc
complete test for format_date smarty function
create new smarty function for displaying date in expected format
Conflicts:
reset_install.sh
