# By Franck Allimant (6) and stephaniepinet (1)
# Via Franck Allimant (2) and Manuel Raynaud (1)
* 'master' of https://github.com/thelia/thelia:
Fixed issue 118
Changed direct accesses to verifyStok by calls to checkAvailableStock
Fixed exception when log file could not be renamed
Added checkAvailableStock(), changed getPassedUrlView() to getObsoleteRewrittenUrlView()
Fixed button wrapping when in tight spaces (e.g, tables)
Added config variable titles
Update CHANGELOG.txt
# By Manuel Raynaud (1) and Nicolas Villa (1)
# Via Manuel Raynaud
* 'master' of https://github.com/thelia/thelia:
add module_include block in product-edit page
Fixed some translations
* '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
* 'master' of git://github.com/thelia/thelia:
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
Check if store_country has a value
Fixed double '/' in generated assets URLs
Add validation for Store configuration
Use Store contact information
Call the wrong AdminResources in saveAction
Action buttons smaller
Replace company_name and contact_email by store_name & store_email
Add a new admin page to manage the basic store configurations
Add routing for Store Configuration
Add argument Title on Content Loop & Folder Loop
