Julien Chanséaume
|
ac51ab21e4
|
add estimated shipping functionnality in cart
|
2014-04-28 12:24:43 +02:00 |
|
Franck Allimant
|
a3883ef1b6
|
Fix for #308
|
2014-04-18 00:01:19 +02:00 |
|
Franck Allimant
|
917b05b65e
|
Restored previous version
|
2014-04-18 00:00:25 +02:00 |
|
Franck Allimant
|
12c21b1239
|
Fixes #308
|
2014-04-17 19:46:21 +02:00 |
|
Manuel Raynaud
|
4391e6334b
|
fix modules cs
|
2014-03-11 15:43:48 +01:00 |
|
Franck Allimant
|
89653f452b
|
Removes container from all Thelia actions, but Modules (#198)
|
2014-01-31 20:06:42 +01:00 |
|
Manuel Raynaud
|
1974d3e3c3
|
fix psr
|
2014-01-22 12:52:36 +01:00 |
|
Etienne Roudeix
|
99038e688a
|
Revert "Revert "Merge branch 'cleanmaster' into modules""
This reverts commit b3ac365b45.
Conflicts:
Readme.md
core/lib/Thelia/Controller/Admin/AbstractCrudController.php
core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
core/lib/Thelia/Core/Template/TemplateDefinition.php
core/lib/Thelia/Model/Base/Coupon.php
core/lib/Thelia/Model/Base/CouponQuery.php
core/lib/Thelia/Model/Base/CouponVersion.php
core/lib/Thelia/Model/Base/CouponVersionQuery.php
core/lib/Thelia/Model/Base/OrderCouponQuery.php
|
2014-01-06 11:25:25 +01:00 |
|
Etienne Roudeix
|
b3ac365b45
|
Revert "Merge branch 'cleanmaster' into modules"
This reverts commit d0ff5260f7, reversing
changes made to 67d0101dbe.
|
2013-12-20 11:16:42 +01:00 |
|
Etienne Roudeix
|
d7c1ecf09a
|
coupon management in order and cart process
|
2013-12-19 14:17:22 +01:00 |
|
OpenStudio
|
89e0bf8867
|
move front controller classes to Front module
|
2013-11-18 10:51:46 +01:00 |
|