* '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
* 'master' of https://github.com/thelia/thelia: (87 commits)
Missing ajax-loader icon
don't use alternative Logger in debugbar if debug is disabled
Remove debug bar
Move temporarily fontawesome's font into the web folder
Add loader css
fix product visibility comparaison parameter
Change this page on public page
Bug : Remove close tag </a>
decode url before searching if it's a rewritten url
Modification font-size of price elements
add page View All
Add button "add product to cart"
Footer : Static to dynamic content
Add order on attribute_combination loop
Fix bug in Content Loop with "current_folder" params
Creation of Content page
Change path /customer/account into /account
Change path : /customer/update into /account/update /password into /account/password
CustomerUpdateForm - Extend CustomerCreation
Update profile - new method [Not finished yet]
...
* 'master' of https://github.com/thelia/thelia:
theliatype in form : types now extends bastype which implement typeinterface basetype provides verifiyForm method wich can be call in Callback constraint
restart thelia form type
thelia type constraints
tax management
fix menu when child > 0
taxes management
tax rule edition
* 'master' of https://github.com/thelia/thelia: (38 commits)
add propel connection in transactions
remove area to area_delivery_module
add an area to a delivery module
create shipping zone area form
update readme
start shipping zone management
complete admin log message
allow to create a new area
delete area
add pre/post methods in Area model
display error message
update area postage
add missinf files
remove country from area and start creating postage management
add country to as area
start area configuration tempalte
choices access through smarty
tax rule creation
downgrade smarty version
create all area events
...
