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

90 Commits

Author SHA1 Message Date
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
Etienne Roudeix
3c71aa613f url global substitution 2013-08-30 14:30:33 +02:00
Etienne Roudeix
75b4564297 rewriting tables 2013-08-29 09:20:58 +02:00
Etienne Roudeix
696b871acd start rewriting 2013-08-29 08:49:48 +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
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
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
gmorel
fab9d2f39a WIP Coupon 
Update Propel2 schema.xml
 2013-08-22 14:25:03 +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
115a7dd893 update schema.xml file 2013-08-16 11:21:57 +02:00
franck
d61eeef0d6 Finalized images action and loop 2013-08-15 20:47:05 +02:00
franck
7bd14d5aab Re-added database.yml.sample 2013-08-15 11:52:02 +02:00
franck
47bc545019 Added image processing actgion and loop 2013-08-15 11:44: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
franck
17b1c333c5 Added position field in lang table 2013-08-07 11:06:48 +02:00
Manuel Raynaud
b18a09b94b allow token to be null in cart table 2013-08-06 11:53:30 +02:00
Manuel Raynaud
2b656336c7 fix typo in CartItem Model 2013-08-06 09:56:19 +02:00
Manuel Raynaud
dcfb4edda3 allow possibility to fix cookie end of life 2013-08-06 09:50:19 +02:00
Manuel Raynaud
fe850718cc update schema, changin some relations between tables 2013-08-02 12:40:51 +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
e4549caf51 remove increase property to product_sale_elements 2013-08-01 10:37:07 +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
76a8d24f4b update schema, remove white spaces 2013-07-29 14:13:07 +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
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
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
Manuel Raynaud
0c1c4b1822 change default locale to en_US 2013-07-10 10:34:13 +02:00
Etienne Roudeix
a02ac99360 set x right to 7 2013-07-09 11:59:37 +02:00
Manuel Raynaud
9db64bbe78 complete install command and fix travis file 2013-07-09 10:52:37 +02:00
Manuel Raynaud
0d1e0c6a2c fiw typo in schema model 2013-07-03 15:05:08 +02:00