* '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:
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
* 'master' of https://github.com/thelia/thelia: (33 commits)
permissions
finish contact process
create contact form
create example for mail usage
permission cleanup
change place where absolute url is create when rewritten url is enabled
fix issue #43
fix typo in product breadcrumb
update countries list
fix issue #35
fix cartItem updateQuantity method
add some verification on country default trigger
not allowed to delete default country
WIP : admin profiles
fiw test suite
clear cache when a module is removed
end module removal
create event object for module delete action
update insert script
new model
...
Conflicts:
core/lib/Thelia/Controller/Admin/CouponController.php
* 'master' of https://github.com/thelia/thelia: (33 commits)
permissions
finish contact process
create contact form
create example for mail usage
permission cleanup
change place where absolute url is create when rewritten url is enabled
fix issue #43
fix typo in product breadcrumb
update countries list
fix issue #35
fix cartItem updateQuantity method
add some verification on country default trigger
not allowed to delete default country
WIP : admin profiles
fiw test suite
clear cache when a module is removed
end module removal
create event object for module delete action
update insert script
new model
...
Conflicts:
core/lib/Thelia/Controller/Admin/CouponController.php
