* '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
# By Manuel Raynaud (68) and others
# Via Manuel Raynaud (12) and others
* 'master' of https://github.com/thelia/thelia: (119 commits)
order tests
action order tests
cache dataccessfunctions
order action test
fire event on insert content in createmethod
fix issue, default foler is set on content creation
allow to create new content
update default param of content model
create content listener for crud management
dispatch event in pre/post crud method for content model
display content modification page
create contentUpdateEvent
create contentCreateEvent
create ContentEvent
create contentModificationForm
create content controller
change folder_id parm by parent in list folder view
use placeholder in folder update route
implement process for changing folder position
allow possibility to change folder visibility
...
Conflicts:
core/lib/Thelia/Coupon/CouponBaseAdapter.php
templates/admin/default/coupon-list.html
templates/admin/default/coupon-read.html
# By Manuel Raynaud (18) and others
# Via franck (9) and others
* 'master' of https://github.com/thelia/thelia: (39 commits)
Working :
Working :
Working :
Working :
Fixed minor visual glitches
Working : Resize countries flag + Add bootstrap-switch
fix test suite
clear asset cache in cache:cler command
Added a 'development mode' to assetic smarty plugin
rewriting router
use good Request object
Added Tools\URL test case, and a test case superclass for initializing Tools\URL
remove unused UrlWritin controller
create router for rewriting matching
customer substitutions
fix typo in front id
Working : For attributes on labels
Working : For attributes on labels
add label_attr attribute to form smarty plugin
start refactorin rewriting routing
...
Conflicts:
core/lib/Thelia/Config/Resources/routing/front.xml
templates/admin/default/assets/less/thelia/bootstrap-editable.less
templates/admin/default/categories.html
