Commit Graph

32 Commits

Author SHA1 Message Date
Manuel Raynaud
c9aa06fd70 modify insert.sql including debugBar module 2013-09-07 16:34:51 +02:00
Manuel Raynaud
43a2c0ac7b refactor Lang table 2013-09-05 08:30:15 +02:00
Etienne Roudeix
dffbf76cfd Merge branch 'master' into rewrite
Conflicts:
	core/lib/Thelia/Controller/BaseController.php
	install/insert.sql
2013-09-04 10:06:22 +02:00
Etienne Roudeix
29bf7d9a92 404 not found management 2013-09-04 10:02:58 +02:00
franck
26da884dae Fixed minor bug in Currencies 2013-09-03 19:32:57 +02:00
franck
ec32aa9eb5 Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
	core/lib/Thelia/Controller/BaseController.php
2013-09-03 19:03:27 +02:00
franck
69f88db090 en_EN -> en_UK, the "en_EN" locale does not exists. 2013-09-03 11:32:13 +02:00
Etienne Roudeix
696b871acd start rewriting 2013-08-29 08:49:48 +02:00
Etienne Roudeix
253a0b76d8 rewriting tables 2013-08-28 15:55:38 +02:00
Etienne Roudeix
9174e5154e backend loop translation 2013-08-26 14:05:29 +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
f028d2b2db Added image-cache:clear console command 2013-08-15 21:18:16 +02:00
franck
d61eeef0d6 Finalized images action and loop 2013-08-15 20:47:05 +02:00
franck
47bc545019 Added image processing actgion and loop 2013-08-15 11:44:46 +02:00
Etienne Roudeix
c9485075d4 new faker entries
new category view
2013-08-13 11:40:24 +02:00
franck
c46a708346 Categories ordrering in the catalog 2013-08-09 10:18:08 +02:00
franck
64031a1883 Added category creation and deletion 2013-08-08 02:39:42 +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
542a83e22c remove references to stock table 2013-07-30 17:25:16 +02:00
Manuel Raynaud
fb2dfa286f update faker script 2013-07-30 11:07:08 +02:00
Manuel Raynaud
e64549c91a fix insert.sql formating request 2013-07-29 15:12:14 +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
Etienne Roudeix
1e6d433338 country loop 2013-07-26 16:57:37 +02:00
Etienne Roudeix
caf3a91ac6 address loop
title loop
2013-07-26 15:41:46 +02:00
Manuel Raynaud
02c9184e53 complete insert sql 2013-07-05 14:47:15 +02:00
Etienne Roudeix
ad47ab7cac set execution right // no more troubles
change composer required PHP version from 5.4 to 5.3
2013-06-20 15:21:16 +02:00
Manuel Raynaud
58c1a759ca remove database name in sql command 2013-06-06 12:02:25 +02:00
Manuel Raynaud
9a4dfac51f complete inser.sql file for running test module 2013-05-29 19:27:26 +02:00
Manuel Raynaud
2319f06fd2 integrate Tpex componant 2013-02-18 22:58:46 +01:00
Manuel Raynaud
ccee45c48a move auto generate documentation to documentation/api folder
start to create a new file for insertion in database
add locale column to lang table
2013-02-11 10:59:31 +01:00