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 |
|