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
franck
cce270fdcc
Factorized ModelCriterialTools calls in loops
2013-08-28 19:47:31 +02:00
gmorel
84a2314108
WIP
...
- Add Coupon BackOffice controller
- Add Coupon BackOffice template skeleton
- Add Coupon BackOffice routes
2013-08-28 18:06:22 +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
franck
efa3eb2767
Category visibility toggle implementation
2013-08-08 10:12:14 +02:00
franck
64031a1883
Added category creation and deletion
2013-08-08 02:39:42 +02:00
franck
90f5bdd453
Added first catalog page
2013-08-07 10:17:22 +02:00
franck
4ad94059e7
Product loop adjustements
2013-08-01 10:53:35 +02:00
franck
f7a635dbf7
Added DataAccess plugin, admin header completed
2013-07-25 22:59:46 +02:00
franck
385a83f896
Finalized admin security
2013-07-12 14:22:08 +02:00
franck
6e5b259d44
Added Feed loop to retreive feeds using SimplePie
2013-07-06 10:18:19 +02:00
Etienne Roudeix
ad47ab7cac
set execution right // no more troubles
...
change composer required PHP version from 5.4 to 5.3
2013-06-20 15:21:16 +02:00
franck
8244efdb1d
Cleanup
2013-06-19 10:33:29 +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
franck
7351edeb46
Test du sparty parser
2013-06-18 15:36:22 +02:00
