mespeche
64698b1d3d
Working
...
Remise en place du chartage CSS du composant datepicker et ajout de la
mixin gradient
2013-08-30 16:01:40 +02:00
gmorel
180302e7cc
Merge branch 'master' of https://github.com/thelia/thelia into coupon
...
# By franck
# Via franck
* 'master' of https://github.com/thelia/thelia :
Factorized ModelCriterialTools calls in loops
Conflicts:
templates/admin/default/assets/bootstrap-editable/css/bootstrap-editable.css
templates/admin/default/assets/css/admin.less
2013-08-30 15:43:43 +02:00
mespeche
ed763344ec
WIP
...
Début de mise en place de coupon/add (coupon/edit)
2013-08-29 17:51:50 +02:00
franck
cce270fdcc
Factorized ModelCriterialTools calls in loops
2013-08-28 19:47:31 +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
franck
c46a708346
Categories ordrering in the catalog
2013-08-09 10:18:08 +02:00
