Commit Graph

18 Commits

Author SHA1 Message Date
franck
c85ec2a9e3 Created AbstractCrudController, and refactored existing controllers 2013-09-12 13:02:40 +02:00
Manuel Raynaud
9002484814 change find method on some request 2013-09-11 09:13:42 +02:00
franck
e8d96937e7 Factorized creation and confirmation modal dialogs 2013-09-06 20:00:02 +02:00
Etienne Roudeix
b6a216fd9b substitutions : product category folder content 2013-09-06 12:21:36 +02:00
franck
318fb3bf2d Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
	templates/admin/default/currencies.html
2013-09-05 23:30:50 +02:00
franck
271e6c64f0 Before merging coupon 2013-09-05 10:00:17 +02:00
franck
d3a287333e Fixed TheliaLoop Smarty plugin (lopp imbrication was broken) 2013-09-04 19:02:26 +02:00
franck
6d5d0f6606 Fixed getUrl() 2013-08-31 15:52:42 +02:00
franck
6aa2f80444 Intriducec BaseI18nLoop, started variable config management 2013-08-31 11:38:00 +02:00
franck
a2d6c16d13 Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
	templates/default/login.html
2013-08-30 19:48:26 +02:00
franck
6867eae9b7 Fixed customer front controller, events, addec admion config. 2013-08-30 19:46:12 +02:00
Etienne Roudeix
c0a4b8b987 Merge branch 'master' into rewrite
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Attribute.php
	core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php
	core/lib/Thelia/Core/Template/Loop/AttributeCombination.php
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/Content.php
	core/lib/Thelia/Core/Template/Loop/Country.php
	core/lib/Thelia/Core/Template/Loop/Currency.php
	core/lib/Thelia/Core/Template/Loop/Feature.php
	core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Image.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Loop/Title.php
	core/lib/Thelia/Model/Tools/ModelCriteriaTools.php
2013-08-30 15:02:48 +02:00
Etienne Roudeix
3c71aa613f url global substitution 2013-08-30 14:30:33 +02:00
Etienne Roudeix
696b871acd start rewriting 2013-08-29 08:49:48 +02:00
franck
cce270fdcc Factorized ModelCriterialTools calls in loops 2013-08-28 19:47:31 +02:00
Etienne Roudeix
9174e5154e backend loop translation 2013-08-26 14:05:29 +02:00
Etienne Roudeix
96b3de7c84 backend trasnlation in loops 2013-08-26 12:38:23 +02:00
Etienne Roudeix
17cc6faec3 front end translation management in loops
apply propel patch
6be7fa1c39
2013-08-22 15:03:31 +02:00