# By Manuel Raynaud (22) and others
# Via Manuel Raynaud (7) and others
* 'master' of https://github.com/thelia/thelia: (32 commits)
refactor name for updating actions
choose UPDATE word for name actions
add update address action and create tests
404 not found management
Working Fix unset namespace
modify travis script
test rewriting exception
Fixed minor bug in Currencies
Finished currency edition
Added route methods
address action implementation
hot fix
rewriting
add address create controller and event
Added AdminUtilities Smarty plugin, optimized templates
update customer model createOrUpdate method
update address model
fix redirect process in viewListener
refactor reset_install script
refactor install process, database management in dedicated class
...
Conflicts:
local/config/schema.xml
reset_install.sh
# By Manuel Raynaud (8) and franck (2)
# Via franck
* 'master' of https://github.com/thelia/thelia:
en_EN -> en_UK, the "en_EN" locale does not exists.
Smarty inheritance in admin template.
fix typo in phpdoc
complete test for foramt_number smarty function
test foramt_date without datetime object
create foramt_number smarty function
remove sqlmap file
add some phpdoc
complete test for format_date smarty function
create new smarty function for displaying date in expected format
Conflicts:
reset_install.sh
# 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
# By Etienne Roudeix
# Via Etienne Roudeix
* 'master' of https://github.com/thelia/thelia:
load test
url output in loops
backend loop translation
backend trasnlation in loops
