# By Manuel Raynaud (92) and others
# Via Manuel Raynaud (28) and others
* 'master' of https://github.com/thelia/thelia: (212 commits)
fix typo
add some php doc
integrate swiftMailer as mailer solution
add swiftmailer in composer
use dump autoloader in all compser scripts
remove script part of composer.json file
fix typo
add some information for OSX requirements
No alert bloc
default country
Autofocus on username field for better use
Beautiful login page
feed loop is now countable
Change error page design
Add validation button on form
- Edit country view creation - Delete and edit modalbox creation - Countries routes management
Completed template management
fix faker
fix faker script
Working : Fixture : cleaning
...
# 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
