Manuel Raynaud
|
a114e559d2
|
Merge branch 'admin' of github.com:thelia/thelia into admin
Conflicts:
core/lib/Thelia/Core/DependencyInjection/Compiler/RegisterSmartyPluginPass.php
core/lib/Thelia/Core/Template/Assets/AsseticHelper.php
|
2013-06-19 16:40:36 +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
|
fa69e6e7f0
|
change rule in .htaccess and fix link for asset
|
2013-06-18 12:24:45 +02:00 |
|
Manuel Raynaud
|
234d74b9eb
|
modify .htaccess
|
2013-06-18 12:02:20 +02:00 |
|
franck
|
9d8c07775b
|
Integration de assetic
|
2013-06-17 15:36:05 +02:00 |
|
franck
|
088f5a3402
|
Intégration de Assetic
|
2013-06-17 15:29:13 +02:00 |
|
franck
|
0b40f1a525
|
Changement emplacmement templates
|
2013-06-10 15:36:02 +02:00 |
|
franck
|
f9068878c7
|
Debut du travail sur le B.O.
|
2013-06-07 15:31:05 +02:00 |
|
Manuel Raynaud
|
e7ddd995f5
|
add Thelia conf into Kernel process
|
2013-03-28 18:04:45 +01:00 |
|
Manuel Raynaud
|
630ac72aaa
|
reindente some code
verify if config database file exists beforeinitializing Propel
|
2013-01-24 20:45:16 +01:00 |
|
Manuel Raynaud
|
65291cf471
|
move front controller to web directory
|
2012-12-18 16:14:43 +01:00 |
|