gmorel
|
8b6cbb0621
|
WIP
- Beginning BackOffice Coupon implementation
|
2013-08-28 14:37:29 +02:00 |
|
Etienne Roudeix
|
86b11096ba
|
Merge branch 'master' into loops
Conflicts:
core/lib/Thelia/Core/Template/Loop/Category.php
core/lib/Thelia/Core/Template/Loop/FeatureValue.php
core/lib/Thelia/Core/Template/Loop/Folder.php
core/lib/Thelia/Core/Template/Loop/Product.php
core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
install/faker.php
|
2013-08-21 09:19:56 +02:00 |
|
Manuel Raynaud
|
6371deb4cb
|
cs fixer
|
2013-08-13 11:02:29 +02:00 |
|
Manuel Raynaud
|
086f73aeca
|
change class controller inheritance
|
2013-08-12 16:59:15 +02:00 |
|
Manuel Raynaud
|
071a4c17bc
|
create specific controller for front and back office
|
2013-08-12 16:56:18 +02:00 |
|
Manuel Raynaud
|
7c6763ea59
|
create controller for front office
|
2013-08-12 15:27:19 +02:00 |
|