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

445 Commits

Author SHA1 Message Date
franck
eb93049897 Added a new loop argument type to pass either true (1), false (0) or 
both (*). Useful for visible argument for example.
 2013-08-07 22:41:57 +02:00
franck
81f142946d Merge branch 'master' of https://github.com/thelia/thelia 2013-08-07 10:17:53 +02:00
franck
90f5bdd453 Added first catalog page 2013-08-07 10:17:22 +02:00
Etienne Roudeix
c8fe340eb4 Merge branch 'loops' 2013-08-02 16:54:32 +02:00
Etienne Roudeix
3507cde1f8 content and folder loops tests 2013-08-02 16:20:52 +02:00
Etienne Roudeix
fd82907209 folder and content fake 
folder and content loops
 2013-08-02 16:18:45 +02:00
Manuel Raynaud
265a6bb2a8 change event class for customer actions 2013-08-02 16:10:26 +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
Etienne Roudeix
8874404e4d remove link from folder 2013-08-02 15:25:29 +02:00
Etienne Roudeix
ab1598e50c bug fix in loops 2013-08-02 14:59:52 +02:00
franck
3a99023c1d Fixed empty loop wich execute contents problem 2013-08-02 13:58:59 +02:00
franck
0482b8c1bd Merge branch 'master' of https://github.com/thelia/thelia 2013-08-02 13:49:26 +02:00
Etienne Roudeix
e8a6d9c900 detailed loop error 2013-08-02 13:39:05 +02:00
Manuel Raynaud
fe850718cc update schema, changin some relations between tables 2013-08-02 12:40:51 +02:00
Etienne Roudeix
866c29adb4 Merge branch 'cart' into loops 2013-08-02 11:50:46 +02:00
Etienne Roudeix
96bf685b39 change default product loop order value 
add tests
 2013-08-02 10:11:54 +02:00
franck
1705e11b88 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Core/Template/Loop/Product.php
 2013-08-01 10:56:54 +02:00
franck
4ad94059e7 Product loop adjustements 2013-08-01 10:53:35 +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
24dfd35182 Merge branch 'master' into loops 2013-07-31 14:03:09 +02:00
Etienne Roudeix
18dd7c1fbf testing loop title 2013-07-31 14:02:59 +02:00
Etienne Roudeix
338ec5fce6 Merge branch 'loops' 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
 2013-07-31 13:56:05 +02:00
Etienne Roudeix
c01607d432 change table name feature_prod 
new loops
 2013-07-31 13:52:11 +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
Etienne Roudeix
a1662c9731 feature loop 2013-07-30 10:02:13 +02:00
Manuel Raynaud
651f191314 manu le bossu's backup 2013-07-30 09:04:41 +02:00
Manuel Raynaud
85007b54c5 add more validation constraints 2013-07-29 16:25:18 +02:00
Etienne Roudeix
2478ddbd24 in progress : feature loop 2013-07-29 16:04:05 +02:00
Manuel Raynaud
fd15934b65 update smarty 2013-07-29 15:47:05 +02:00
Manuel Raynaud
0738104f52 remove combination_id in stock table 2013-07-29 15:26:33 +02:00
Manuel Raynaud
b0622c1fae update thelia model 2013-07-29 14:08:09 +02:00
Etienne Roudeix
dbe06a3057 country loop 2013-07-29 11:46:23 +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
Manuel Raynaud
67d38c0619 create form for adding product in cart 2013-07-29 11:06:46 +02:00
Manuel Raynaud
9657f6e013 create CombinationNotFoundException 2013-07-29 11:06:18 +02:00
Manuel Raynaud
98f3365e33 create exception for action part 2013-07-29 10:00:05 +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
Manuel Raynaud
8c2eb5987c Merge branch 'cart' 
Conflicts:
	core/lib/Thelia/Core/HttpFoundation/Session/Session.php
 2013-07-26 15:59:32 +02:00
Manuel Raynaud
a1a3b73d9c add some phpdoc 2013-07-26 15:57:22 +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
Manuel Raynaud
9f4a2778e3 fix endlife cookie cart 2013-07-26 15:40:05 +02:00
Manuel Raynaud
74fb217cb4 finish session test for cart part 2013-07-26 11:58:59 +02:00