# By Etienne Roudeix (10) and franck (2)
# Via Etienne Roudeix (3) and franck (2)
* 'master' of https://github.com/thelia/thelia:
Polished categories related content
Finished category related content management
delivery process
delivery form
order delivery form
fix fixture dependant unit test
delivery process
delivery process
cart integration
cart integration
cart page
cart template
Conflicts:
install/faker.php
# By Etienne Roudeix (7) and Manuel Raynaud (7)
# Via Etienne Roudeix (2) and Manuel Raynaud (1)
* 'master' of https://github.com/thelia/thelia:
tax in loops
remove test
finish simple list customer page in backoffice
debug bar
mock getTotalAmoutn in order class
tax engine
escae output only if it's not an object
tax faker
insert 19.6 tva
create admin customer view and add output info in customer loop
update format smarty plugin
tax engine model
tax engine model
create customer admin controller and index controller
# 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
# By franck (9) and others
# Via franck (3) and Etienne Roudeix (1)
* 'master' of https://github.com/thelia/thelia:
Added get/setLangId() method in session
Refactored VariableXxxxx.php as ConfigXxxx.php
Added name duplication check when creating a variable
Completed the backoffice variable management
update propel version and dependencies
add some phpdoc
Fixed getUrl()
Typo :(
Intriducec BaseI18nLoop, started variable config management
Fixed URL::absoluteUrl()
Fixed customer front controller, events, addec admion config.
rewriting
specific rewrittend url retrievement
product page
url global substitution
sid : rewriting
rewriting tables
start rewriting
Conflicts:
core/lib/Thelia/Config/Resources/routing/admin.xml
core/lib/Thelia/Core/Event/TheliaEvents.php
