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

90 Commits

Author SHA1 Message Date
Manuel Raynaud
376471db04 Merge branch 'cart' 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
 2013-08-08 18:03:23 +02:00
Manuel Raynaud
2e1627398c start to implement cart loop 2013-08-08 17:56:30 +02:00
franck
4e83466bc0 Form processing is now factorized in BaseAction 2013-08-08 11:13:46 +02:00
Manuel Raynaud
7e5c296fb2 Merge branch 'cart' 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Core/Event/TheliaEvents.php
 2013-08-08 10:11:22 +02:00
franck
64031a1883 Added category creation and deletion 2013-08-08 02:39:42 +02:00
Manuel Raynaud
80496641c6 try to test form 2013-08-07 14:55:27 +02:00
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
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
Manuel Raynaud
2f2e88b9fc Merge branch 'master' into cart 2013-08-07 09:44:34 +02:00
Etienne Roudeix
fd82907209 folder and content fake 
folder and content loops
 2013-08-02 16:18:45 +02:00
Manuel Raynaud
9995daa158 dispatch event when cart is duplicated 2013-08-02 16:01:21 +02:00
Etienne Roudeix
8874404e4d remove link from folder 2013-08-02 15:25:29 +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
Etienne Roudeix
338ec5fce6 Merge branch 'loops' 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
 2013-07-31 13:56:05 +02:00
Etienne Roudeix
96239e4af4 tables update 2013-07-30 11:12:55 +02:00
Manuel Raynaud
651f191314 manu le bossu's backup 2013-07-30 09:04:41 +02:00
Etienne Roudeix
2478ddbd24 in progress : feature loop 2013-07-29 16:04: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
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
Etienne Roudeix
9e663145b0 customer loop 2013-07-26 10:04:35 +02:00
franck
f7a635dbf7 Added DataAccess plugin, admin header completed 2013-07-25 22:59:46 +02:00
franck
182b13ceca In an Action, errored forms are propagated via the ActionEvent 2013-07-24 20:08:00 +02:00
franck
94ee77f4f8 Merge branch 'master' of https://github.com/thelia/thelia 2013-07-24 17:38:54 +02:00
franck
fabeab1822 An errorred form is now passed to the Form smarty plugin through the parser context instead of the 
session
 2013-07-24 17:31:20 +02:00
Etienne Roudeix
59f5b102c6 Merge branch 'master' into loops 2013-07-23 10:44:41 +02:00
Etienne Roudeix
c28ac536aa accessory loop 
product loop
order fix
 2013-07-19 13:59:25 +02:00
franck
8296051937 Implemented front-office login 2013-07-17 18:49:23 +02:00
franck
3d5caa2341 Fix source header alignment 2013-07-17 15:06:53 +02:00
franck
21068f4c1f Added UrlGenerator smarty plugin, to allow templates and url 
manipulation in templates.
 2013-07-17 11:36:28 +02:00
franck
e8bf47b929 Refactored Form system to get simple error handling and a clearer 
interface
 2013-07-16 16:34:47 +02:00
franck
75573b3652 Merge branch 'master' of https://github.com/thelia/thelia 2013-07-12 14:22:58 +02:00
franck
385a83f896 Finalized admin security 2013-07-12 14:22:08 +02:00
Manuel Raynaud
2d13a28fbf create command for generating sql from mosule schema 2013-07-11 17:06:12 +02:00
Manuel Raynaud
98589cc2b6 generate Model using Propel command in Thelia app 2013-07-11 16:44:18 +02:00
Manuel Raynaud
945a97ae78 initialize module part 2013-07-11 10:28:58 +02:00
franck
dd05888450 Added Auth loop 2013-07-09 11:42:25 +02:00
franck
2b0fdc670b Merge 2013-07-08 13:25:08 +02:00
franck
6890482101 Working on security 2013-07-08 13:22:11 +02:00
franck
5bec576b9b Integration of security 2013-07-08 13:20:44 +02:00
franck
abdff9bc1a Merge branch 'admin' 
Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Core/Template/Element/BaseLoop.php
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php
 2013-07-08 11:27:37 +02:00
Manuel Raynaud
0b9d7d1d35 allow possibility to change PropelPDO class connection 2013-07-08 10:44:57 +02:00
franck
162084140e Merge remote-tracking branch 'origin/master' into admin 
Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php
 2013-07-06 10:34:09 +02:00
franck
6e5b259d44 Added Feed loop to retreive feeds using SimplePie 2013-07-06 10:18:19 +02:00
Etienne Roudeix
55a309c00a Merge branch 'master' into loops 
Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php
	templates/smarty-sample/index.html
 2013-07-05 11:16:55 +02:00
Manuel Raynaud
715e7ac294 Merge branch 'customer' 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Model/Customer.php
	templates/smarty-sample/index.html
 2013-07-04 19:46:08 +02:00