Commit Graph

6 Commits

Author SHA1 Message Date
Etienne Roudeix
3c71aa613f url global substitution 2013-08-30 14:30:33 +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
Manuel Raynaud
ecb42e906b refactor update item eventListener 2013-08-14 15:55:06 +02:00
Manuel Raynaud
7f83225645 fix test suite issue 2013-08-13 09:34:08 +02:00
Manuel Raynaud
2e1627398c start to implement cart loop 2013-08-08 17:56:30 +02:00
Manuel Raynaud
df371355b9 change phpdoc api generator to phpdoc 2013-08-08 13:26:49 +02:00