* '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]
...
# By Manuel Raynaud (19) and others
# Via Manuel Raynaud (5) and others
* 'master' of https://github.com/thelia/thelia: (37 commits)
add PropelDataCollector to debugbar, still missing some informations
remove unused class
integrate debugbar module
remove htmlpurifier
modify insert.sql including debugBar module
add new event and new tag
Started category modification
Factorized modal dialogs javascript
Factorized creation and confirmation modal dialogs
create controller adding delivery module in session
create Delivery loop
Working :
Continuing categories administration...
Working :
create base loop for delivery and payment entities
remove htmlpurifier dependency
country id can be an argument for calculate method
Working :
Working :
fix typo
...
Conflicts:
composer.lock
core/lib/Thelia/Controller/Admin/CategoryController.php
templates/admin/default/assets/less/thelia/variables.less
