Commit Graph

13 Commits

Author SHA1 Message Date
Manuel Raynaud
3c87fa8bd0 Merge branch 'master' into cart
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	install/faker.php
2013-08-07 10:23:44 +02:00
Manuel Raynaud
b18a09b94b allow token to be null in cart table 2013-08-06 11:53:30 +02:00
Etienne Roudeix
5c4bba4ce9 feature and feature_av in faker 2013-08-02 16:26:30 +02:00
Etienne Roudeix
fd82907209 folder and content fake
folder and content loops
2013-08-02 16:18:45 +02:00
Etienne Roudeix
aac1533e65 change faker 2013-08-02 15:35:06 +02:00
Manuel Raynaud
8f46c57d72 update faker script 2013-08-01 11:53:40 +02:00
Manuel Raynaud
fb2dfa286f update faker script 2013-07-30 11:07:08 +02:00
Manuel Raynaud
a2012259bf change getting propel connection 2013-07-05 12:57:04 +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
Manuel Raynaud
78dd8514d1 add all substitution for loop category 2013-05-06 15:22:33 +02:00
Manuel Raynaud
046f0e0f94 start to create first loop 2013-05-03 17:06:43 +02:00
Manuel Raynaud
7d766c68ff delete table before inserting faker data 2013-04-30 14:56:23 +02:00
Manuel Raynaud
5b4daf0659 create a faker for adding some fixtures 2013-04-30 14:12:52 +02:00