* 'master' of https://github.com/thelia/thelia: (121 commits)
set cartItem in cart add and update events
need to unescape breadcrumb strings after been in array
update readme file
update insert.sql with new release version
change changelog file format
Prevent product and content création at catalog root
dynamic delivery modules on delivery front template
complete changelog
Finished merging modules with master
Revert "Merge branch 'cleanmaster' into modules"
use TaxEngine::getDeliveryCountry in delivery loop
refacto getTaxCountry which is actually getDeliveryCountry
make it magic last stand
change loop in shipping zone template using module insteadof delivery
Fixed template loop
Refactored templates processing
complete readme file
change email address of core contributors
fix getPosition folder test
add coupon tests
...
Conflicts:
core/lib/Thelia/Controller/Admin/ProductController.php
Fixed issue #123. Introduced NumberFormat::formatStandardNumber()
Adding translation for Backoffice
Adding translation for Backoffice
fix close#131
fix updatePositionDownTest
Translation : Ordering existing translations by keys. This should ease the merge process when conflicts occur
Translation : Ordering existing translations by keys, This should ease the merge process when conflicts occur
Translation : Ordering existing translations by keys, This should ease the merge process when conflicts occur
* 'master' of git://github.com/thelia/thelia: (23 commits)
Coupon : Add unit test for coupon removing X Amount & X Percent
Coupon : Add unit test for coupon removing X Amount & X Percent
Coupon : Add unit test for coupon removing X Amount & X Percent
Coupon : Add unit test for coupon removing X Amount & X Percent
Coupon : Add unit test for coupon removing X Amount & X Percent
Coupon : Fix namespace issues
Coupon : Fix namespace issues
Coupon : Adding unit tests
Coupon : Adding unit tests
Coupon : Adding unit tests
Coupon : Adding unit tests
Coupon : buildCouponFromModel becomes public
Coupon : Add ability to know usage left after decremental
Coupon : Bug fix when coupon max usage was not correctly decremented
Coupon : spelling
Coupon : rename
Coupon : Fix the error if a given coupon leads to an unknown service id
Coupon not found by the factory now just return false
Fix generated unit test stub files
Refactor removing Manager notion
...
* 'master' of git://github.com/thelia/thelia:
fix typo
Implemented mail messages templates and layouts
Email template + test email
add REF to product_sale_element loop and fix product tempalte
Correct link "Go to admin page" alike thelia is installed in the root of virtual host or in a subdirectory
Add correct url(subdiretory included) in config page
Use getUriForPath() instead getSchemeAndHttpHost() for proper redirection for cases where Thelia is installed in a subdirectory
