franck
|
f32daae118
|
Merge, suite
|
2013-06-19 11:21:40 +02:00 |
|
franck
|
2eca5464b7
|
Merge branch 'smarty' into admin
Conflicts:
core/lib/Thelia/Config/Resources/config.xml
core/lib/Thelia/Core/EventListener/ViewListener.php
core/lib/Thelia/Core/Template/SmartyParser.php
templates/smarty-sample/index.html
|
2013-06-19 11:20:41 +02:00 |
|
franck
|
8244efdb1d
|
Cleanup
|
2013-06-19 10:33:29 +02:00 |
|
franck
|
89abfaad48
|
Integration of Assetic in SmartyParser, extended it to Admin (we can now
use loops !), added the Thelia ControllerResolver and fixed config and
routing accordingly.²:wq
|
2013-06-19 02:07:43 +02:00 |
|
Manuel Raynaud
|
dfafe36730
|
poc integrate smarty in DI
|
2013-06-18 23:32:47 +02:00 |
|
franck
|
7351edeb46
|
Test du sparty parser
|
2013-06-18 15:36:22 +02:00 |
|