TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,780 Commits 1 Branch 0 Tags
7695c19b402a71947ef20cebcbb82ddea3e2d3fc
Commit Graph

69 Commits

Author SHA1 Message Date
Manuel Raynaud
65d23db854 validate country creation 2013-10-07 12:46:40 +02:00
Etienne Roudeix
622e1ca3b6 Merge branch 'master' into tax 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Model/Base/AttributeTemplate.php
	core/lib/Thelia/Model/Base/AttributeTemplateQuery.php
	core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php
	install/thelia.sql
	local/config/schema.xml
 2013-09-27 10:29:51 +02:00
Etienne Roudeix
5e0f9cedf5 fix tests 2013-09-26 10:43:09 +02:00
Etienne Roudeix
7bd511c420 order admin 2013-09-24 17:04:32 +02:00
franck
e3644cd6cc Aded feature_template and category_template position management 2013-09-21 11:46:09 +02:00
franck
f6530f0bfc Finished product feature values 2013-09-20 23:10:31 +02:00
franck
e27b3cfbae Working catalog branch 2013-09-20 15:54:50 +02:00
Etienne Roudeix
17548e3526 order tax tables 2013-09-20 08:23:02 +02:00
Etienne Roudeix
1d969e38ec order tables 2013-09-19 18:30:13 +02:00
Etienne Roudeix
61fab3a62a order creation 2013-09-19 15:11:54 +02:00
Etienne Roudeix
9b37bbb862 module image 2013-09-18 11:20:29 +02:00
franck
d02f13f021 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Model/Product.php
 2013-09-18 00:35:48 +02:00
franck
de4767ef56 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Model/Product.php
 2013-09-17 23:51:31 +02:00
Manuel Raynaud
e1e383707b template is not mandatory in product table. 2013-09-17 19:19:52 +02:00
franck
a9009b7e52 Started product management 2013-09-17 17:15:15 +02:00
Etienne Roudeix
8d20316217 no-return-functions block 2013-09-17 14:59:40 +02:00
Etienne Roudeix
c4fd65e6ea delivery process 2013-09-17 12:38:23 +02:00
Etienne Roudeix
692badb06b delivery form 2013-09-17 11:05:29 +02:00
Etienne Roudeix
5ca7136e6d default country 2013-09-16 15:30:46 +02:00
Manuel Raynaud
77c0dd73d6 force charset in sql files 2013-09-16 11:10:25 +02:00
Manuel Raynaud
5e3c10cd4f add promo column in cart_item 2013-09-16 10:16:54 +02:00
franck
71c1cee66d Implemented "Remember Me" feature on admin. Started template management 2013-09-16 09:23:44 +02:00
Manuel Raynaud
c9e455e3ea update cart model 2013-09-12 15:40:49 +02:00
Etienne Roudeix
d5004071c9 pse ref 2013-09-12 11:56:00 +02:00
Etienne Roudeix
e8a4e56324 tax engine 2013-09-11 16:21:51 +02:00
Etienne Roudeix
8570251b88 product price 2013-09-10 12:04:33 +02:00
Etienne Roudeix
ca9ec3b089 tax engine model 2013-09-09 11:01:31 +02:00
Manuel Raynaud
b067ef7dcc create Delivery loop 2013-09-06 18:41:44 +02:00
Manuel Raynaud
43a2c0ac7b refactor Lang table 2013-09-05 08:30:15 +02:00
Manuel Raynaud
483710afd2 update address model 2013-09-03 14:01:07 +02:00
franck
3191a928ab Completed mailing templates management 2013-09-02 16:21:49 +02:00
Etienne Roudeix
3c71aa613f url global substitution 2013-08-30 14:30:33 +02:00
Etienne Roudeix
253a0b76d8 rewriting tables 2013-08-28 15:55:38 +02:00
Etienne Roudeix
2d370bf9b8 rewriting tables 2013-08-28 15:48:19 +02:00
Etienne Roudeix
1de0e9f8a4 rewriting tables 2013-08-28 15:47:47 +02:00
Etienne Roudeix
61e13c416c rewriting tables 2013-08-28 15:35:10 +02:00
Etienne Roudeix
7ef0339784 associated content for categories and products tables 2013-08-22 17:54:19 +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
ca954a3b81 fix insert.sql syntax and downgrade propel version for validator 
compatibility
 2013-08-16 11:45:03 +02:00
franck
d61eeef0d6 Finalized images action and loop 2013-08-15 20:47:05 +02:00
franck
e2083d4cbf Typo: fixed ProdutImage -> ProductImage 2013-08-15 11:10:32 +02:00
Etienne Roudeix
c9485075d4 new faker entries 
new category view
 2013-08-13 11:40:24 +02:00
Etienne Roudeix
2fa19d5ae5 new image and document management 2013-08-12 14:42:20 +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
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
Manuel Raynaud
fe850718cc update schema, changin some relations between tables 2013-08-02 12:40:51 +02:00
Manuel Raynaud
f69b2cfc11 update model removing increase property 2013-08-01 10:40:27 +02:00