TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
564 Commits 1 Branch 0 Tags
df371355b943a42b65bf40ecd197f6f7be0b80ad
Commit Graph

59 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
3fbb72b36c complete INTALL-TODO 2013-08-07 10:20:04 +02:00
Manuel Raynaud
b18a09b94b allow token to be null in cart table 2013-08-06 11:53:30 +02:00
Manuel Raynaud
c97f0e462a regenerate modeland sql fixing typo in CartItem table 2013-08-06 09:57:14 +02:00
Manuel Raynaud
33933a63cb update sql creation 2013-08-06 09:53:15 +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
a117750ca8 Merge branch 'cart' into loops 2013-08-02 15:37:44 +02:00
Etienne Roudeix
aac1533e65 change faker 2013-08-02 15:35:06 +02:00
Manuel Raynaud
fe850718cc update schema, changin some relations between tables 2013-08-02 12:40:51 +02:00
Manuel Raynaud
8f46c57d72 update faker script 2013-08-01 11:53:40 +02:00
Manuel Raynaud
14bc1663bf Merge branch 'cart' 
Conflicts:
	composer.lock
	core/lib/Thelia/Model/Base/Attribute.php
	core/lib/Thelia/Model/Base/AttributeAv.php
	core/lib/Thelia/Model/Base/AttributeCombination.php
	core/lib/Thelia/Model/Base/AttributeCombinationQuery.php
	core/lib/Thelia/Model/Base/Cart.php
	core/lib/Thelia/Model/Base/CartItem.php
	core/lib/Thelia/Model/Base/CartItemQuery.php
	core/lib/Thelia/Model/Base/Currency.php
	core/lib/Thelia/Model/Base/CurrencyQuery.php
	core/lib/Thelia/Model/Base/Product.php
	core/lib/Thelia/Model/Base/ProductPrice.php
	core/lib/Thelia/Model/Base/ProductPriceQuery.php
	core/lib/Thelia/Model/Map/AttributeCombinationTableMap.php
	core/lib/Thelia/Model/Map/CartItemTableMap.php
	core/lib/Thelia/Model/Map/CurrencyTableMap.php
	core/lib/Thelia/Model/Map/ProductPriceTableMap.php
	core/lib/Thelia/Model/Map/ProductTableMap.php
	install/thelia.sql
	local/config/schema.xml
 2013-08-01 10:52:17 +02:00
Manuel Raynaud
f69b2cfc11 update model removing increase property 2013-08-01 10:40:27 +02:00
Etienne Roudeix
338ec5fce6 Merge branch 'loops' 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
 2013-07-31 13:56:05 +02:00
Manuel Raynaud
542a83e22c remove references to stock table 2013-07-30 17:25:16 +02:00
Manuel Raynaud
acb05f81dc change stock table name 2013-07-30 17:06:29 +02:00
Etienne Roudeix
799e4ad5df rename feature_prod feature_product 2013-07-30 11:32:04 +02:00
Etienne Roudeix
96239e4af4 tables update 2013-07-30 11:12:55 +02:00
Manuel Raynaud
fb2dfa286f update faker script 2013-07-30 11:07:08 +02:00
Manuel Raynaud
0738104f52 remove combination_id in stock table 2013-07-29 15:26:33 +02:00
Manuel Raynaud
e64549c91a fix insert.sql formating request 2013-07-29 15:12:14 +02:00
Manuel Raynaud
76a8d24f4b update schema, remove white spaces 2013-07-29 14:13:07 +02:00
Etienne Roudeix
37a66694c7 country loop 
coutryI18n data
 2013-07-29 11:10:16 +02:00
Manuel Raynaud
dc73e34f0f add method checking if stock needed is valid or not 2013-07-29 11:07:03 +02:00
Etienne Roudeix
b448ae21ae Merge branch 'loops' 2013-07-26 16:58:02 +02:00
Etienne Roudeix
1e6d433338 country loop 2013-07-26 16:57:37 +02:00
Etienne Roudeix
ee6a2a645f Merge branch 'master' of github.com:thelia/thelia 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
 2013-07-26 15:45:26 +02:00
Etienne Roudeix
caf3a91ac6 address loop 
title loop
 2013-07-26 15:41:46 +02:00
franck
c6366c69bd Merge branch 'master' of https://github.com/thelia/thelia 2013-07-25 23:01:00 +02:00
franck
f7a635dbf7 Added DataAccess plugin, admin header completed 2013-07-25 22:59:46 +02:00
Etienne Roudeix
46251d2adc fix error 2013-07-25 11:19:10 +02:00
Etienne Roudeix
d91294c920 error 2013-07-25 11:18:37 +02:00
Etienne Roudeix
6c046417cb is_default in address table 2013-07-25 11:15:04 +02:00
Etienne Roudeix
f05331da1a category link last stand 2013-07-24 14:51:36 +02:00
Manuel Raynaud
38e4b6a09d cart is persist now 2013-07-23 16:01:00 +02:00
Manuel Raynaud
20f19438f1 change customer title index name 2013-07-23 11:02:16 +02:00
Manuel Raynaud
9a9572e1b5 fix duplicated foreign key 2013-07-23 10:57:37 +02:00
Manuel Raynaud
274b515f0a update thelia sql 2013-07-23 10:46:46 +02:00
franck
8296051937 Implemented front-office login 2013-07-17 18:49:23 +02:00
Manuel Raynaud
72df28f439 update schema for customer 2013-07-12 16:48:25 +02:00
Manuel Raynaud
dc22d5bf59 change customer model 2013-07-12 16:23:06 +02:00
franck
f6cb119616 Initiated translation system 2013-07-12 14:24:55 +02:00
Manuel Raynaud
02c9184e53 complete insert sql 2013-07-05 14:47:15 +02:00
Manuel Raynaud
a2012259bf change getting propel connection 2013-07-05 12:57:04 +02:00
Manuel Raynaud
0d1e0c6a2c fiw typo in schema model 2013-07-03 15:05:08 +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
58c1a759ca remove database name in sql command 2013-06-06 12:02:25 +02:00
Manuel Raynaud
9a4dfac51f complete inser.sql file for running test module 2013-05-29 19:27:26 +02:00
Manuel Raynaud
664a28f042 update thelia.sql 2013-05-15 16:50:52 +02:00
Manuel Raynaud
78dd8514d1 add all substitution for loop category 2013-05-06 15:22:33 +02:00