|
|
66ce4ee218
|
Inital commit
|
2020-11-19 15:36:28 +01:00 |
|
Franck Allimant
|
d576e62082
|
Removed uses of Base in core/lib/Thelia/Model
|
2014-05-19 09:50:18 +02:00 |
|
Franck Allimant
|
2c7337d8e0
|
Applied php-cs-fixer with level psr2
|
2014-05-17 10:56:29 +02:00 |
|
Franck Allimant
|
90947bcda9
|
Free shipping restricitions based on Countries and Shipping module
|
2014-05-16 10:30:15 +02: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
|
1ba60103f3
|
coupon in orders + model review : backquote use
|
2013-12-18 17:46:42 +01:00 |
|
