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

57 Commits

Author SHA1 Message Date
gmorel
19ea6d25df WIP 
Merge on master
 2013-09-03 11:02:36 +02:00
gmorel
33b8ceb24e Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (2) and franck (1)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Completed mailing templates management
  change symfony/icu version for compatibility
  add file reset_install.sh

Conflicts:
	composer.json
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Model/Map/CouponI18nTableMap.php
	install/thelia.sql
	local/config/schema.xml
	reset_install.sh
 2013-09-02 17:25:25 +02:00
gmorel
ae0f2e766b Working 
- merge schema
 2013-09-02 17:08:01 +02:00
franck
3191a928ab Completed mailing templates management 2013-09-02 16:21:49 +02:00
gmorel
5a1d622284 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By franck (9) and others
# Via franck (3) and Etienne Roudeix (1)
* 'master' of https://github.com/thelia/thelia:
  Added get/setLangId() method in session
  Refactored VariableXxxxx.php as ConfigXxxx.php
  Added name duplication check when creating a variable
  Completed the backoffice variable management
  update propel version and dependencies
  add some phpdoc
  Fixed getUrl()
  Typo :(
  Intriducec BaseI18nLoop, started variable config management
  Fixed URL::absoluteUrl()
  Fixed customer front controller, events, addec admion config.
  rewriting
  specific rewrittend url retrievement
  product page
  url global substitution
  sid : rewriting
  rewriting tables
  start rewriting

Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml
	core/lib/Thelia/Core/Event/TheliaEvents.php
 2013-09-02 09:19:24 +02:00
franck
6867eae9b7 Fixed customer front controller, events, addec admion config. 2013-08-30 19:46:12 +02:00
gmorel
37659415ad WIP 
- Add Coupon Event
- Customer Parameter
 2013-08-29 16:20:41 +02:00
gmorel
71a91ff60f Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Etienne Roudeix (4) and franck (1)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Removed InternalEvent, simplified SecurityContext
  rewriting tables
  rewriting tables
  rewriting tables
  rewriting tables

Conflicts:
	composer.lock
	local/config/schema.xml
 2013-08-28 18:19:38 +02:00
gmorel
6c2dbb0152 Working 
- Add regenerated Model classes
 2013-08-28 18:09:17 +02:00
Etienne Roudeix
253a0b76d8 rewriting tables 2013-08-28 15:55:38 +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
gmorel
47106f562d Merge branch 'coupon' of https://github.com/thelia/thelia into coupon 
Conflicts:
	core/lib/Thelia/Model/Base/Coupon.php
	core/lib/Thelia/Model/Base/CouponI18n.php
	core/lib/Thelia/Model/Base/CouponQuery.php
	core/lib/Thelia/Model/Base/CouponVersion.php
	core/lib/Thelia/Model/Base/CouponVersionQuery.php
	core/lib/Thelia/Model/Base/ProductAssociatedContent.php
	core/lib/Thelia/Model/Map/CouponTableMap.php
	core/lib/Thelia/Model/Map/CouponVersionTableMap.php
	install/faker.php
	install/thelia.sql
	local/config/schema.xml
 2013-08-28 10:11:57 +02:00
gmorel
eae86cd797 WIP Coupon 
Refactor
 2013-08-23 20:00:32 +02:00
Etienne Roudeix
fe4b77f7a8 associated content for categories and product tables + loop 2013-08-23 10:55:59 +02:00
gmorel
73677b7c1a WIP Coupon 
Update Coupon Model + SQL
Implementattion Fixtures for Coupon and CouponFactory
 2013-08-22 20:02:03 +02:00
Etienne Roudeix
7ef0339784 associated content for categories and products tables 2013-08-22 17:54:19 +02:00
Etienne Roudeix
17cc6faec3 front end translation management in loops 
apply propel patch
6be7fa1c39
 2013-08-22 15:03:31 +02:00
gmorel
1734ed1c1f WIP Coupon 
Update Coupon Model + SQL
en_US changed to en_EN ?
 2013-08-22 14:50:38 +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
franck
d61eeef0d6 Finalized images action and loop 2013-08-15 20:47:05 +02:00
franck
a56e05b36b Added image action and loop 2013-08-15 11:46:46 +02:00
franck
845a2f9f73 Typo: fixed ProdutImage -> ProductImage 2013-08-15 10:43:07 +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
c97f0e462a regenerate modeland sql fixing typo in CartItem table 2013-08-06 09:57:14 +02:00
Manuel Raynaud
3262d01791 update model 2013-08-06 09:52:41 +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
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
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
caf3a91ac6 address loop 
title loop
 2013-07-26 15:41:46 +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
franck
2c52df1034 Added title_id column in customer table 2013-07-18 09:40:21 +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
Etienne Roudeix
a02ac99360 set x right to 7 2013-07-09 11:59:37 +02:00
Manuel Raynaud
9ed14bf7a3 change default locale to en_US 2013-07-05 11:21:31 +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
Manuel Raynaud
8279cc37b4 remove notnorm gen model 2013-01-15 10:39:16 +01:00