# 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 mespeche
# Via mespeche
* 'master' of https://github.com/thelia/thelia:
WIP : Comment of route url-rewriting.check
Working : Fix script reset
Working : Cleanup admin new version bootstrap v3
Working : Finish renaming class for bootstrap migration
Working : Major class changes migration from bootstrap 2.x to 3.0
Conflicts:
reset_install.sh
templates/admin/default/assets/css/admin.less
# By mespeche
# Via mespeche
* 'master' of https://github.com/thelia/thelia:
WIP : Comment of route url-rewriting.check
Working : Fix script reset
Working : Cleanup admin new version bootstrap v3
Working : Finish renaming class for bootstrap migration
Working : Major class changes migration from bootstrap 2.x to 3.0
Conflicts:
reset_install.sh
templates/admin/default/assets/css/admin.less
# By mespeche
# Via mespeche
* 'master' of https://github.com/thelia/thelia:
WIP : Comment of route url-rewriting.check
Working : Fix script reset
Working : Cleanup admin new version bootstrap v3
Working : Finish renaming class for bootstrap migration
Working : Major class changes migration from bootstrap 2.x to 3.0
Conflicts:
reset_install.sh
templates/admin/default/assets/css/admin.less
# 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
