Commit Graph

44 Commits

Author SHA1 Message Date
Manuel Raynaud
1e660cd930 Merge branch 'delivery'
Conflicts:
	composer.lock
	install/insert.sql
2013-09-07 16:37:54 +02:00
Manuel Raynaud
9ebf16f1f6 remove htmlpurifier 2013-09-07 16:36:41 +02:00
Manuel Raynaud
2fda14cfeb remove htmlpurifier dependency 2013-09-06 17:35:51 +02:00
Manuel Raynaud
f6ab8888f3 start creating debugbar 2013-09-05 17:43:12 +02:00
Manuel Raynaud
fd80139a9c change symfony/icu version for compatibility 2013-09-02 15:25:01 +02:00
Manuel Raynaud
932bf00532 update propel version and dependencies 2013-09-01 19:26:13 +02:00
franck
6d5d0f6606 Fixed getUrl() 2013-08-31 15:52:42 +02:00
franck
0361cd1ff2 Removed InternalEvent, simplified SecurityContext 2013-08-28 17:52:32 +02:00
Manuel Raynaud
ab5e845ad3 start refactoring customer update process 2013-08-16 12:09:08 +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
bceb65dad6 Reverted symfony/validator from 2.3 to 2.2, because of failures in
dependencies.
2013-08-15 11:27:30 +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
409b4e083f update composer.lock file 2013-08-01 09:44:50 +02:00
Manuel Raynaud
fd15934b65 update smarty 2013-07-29 15:47:05 +02:00
franck
f7a635dbf7 Added DataAccess plugin, admin header completed 2013-07-25 22:59:46 +02:00
franck
8296051937 Implemented front-office login 2013-07-17 18:49:23 +02:00
Manuel Raynaud
945a97ae78 initialize module part 2013-07-11 10:28:58 +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
1a6cde1c65 update composer.lock file 2013-07-09 11:47:24 +02:00
Manuel Raynaud
25a8b28c61 track composer.lock file 2013-07-09 10:19:35 +02:00
Manuel Raynaud
dda7fd02ae remove composer.lock from index 2013-06-10 16:37:13 +02:00
franck
156f281162 Merge branch 'franck' into admin
Conflicts:
	composer.lock
	core/lib/Thelia/Core/Thelia.php
2013-06-10 16:35:49 +02:00
franck
0b40f1a525 Changement emplacmement templates 2013-06-10 15:36:02 +02:00
franck
f9068878c7 Debut du travail sur le B.O. 2013-06-07 15:31:05 +02:00
Manuel Raynaud
c4d8aef962 update composer dependencies and add filsesystem component 2013-06-03 12:18:16 +02:00
Manuel Raynaud
e7bca634db delete non unsed ActionMatcher 2013-05-22 12:08:54 +02:00
Manuel Raynaud
c6fb8f22f1 refactor action factory, className are inject from service container 2013-05-21 21:17:40 +02:00
Manuel Raynaud
20d1655c9d rename plugins to modules 2013-05-16 11:13:09 +02:00
Manuel Raynaud
5b4daf0659 create a faker for adding some fixtures 2013-04-30 14:12:52 +02:00
Manuel Raynaud
5c401020f9 integrate symfony-cmf/Routing component using chainRouter 2013-04-18 16:30:31 +02:00
Manuel Raynaud
03d94cd88c update tpex commit 2013-04-10 15:06:18 +02:00
Manuel Raynaud
266e0bd5eb change Tpex integration 2013-04-08 17:06:04 +02:00
Manuel Raynaud
8433c5d555 refactor propel configuration 2013-03-26 17:25:10 +01:00
Manuel Raynaud
f8cbfbd858 update symfony component version 2013-03-25 15:36:47 +01:00
Manuel Raynaud
3a415d1123 parser 2013-03-13 19:51:07 +01:00
Manuel Raynaud
6f08dbcd28 include Tpex as submodule 2013-02-19 14:19:57 +01:00
Manuel Raynaud
3a79577260 remove dumper and skeleton 2013-02-19 08:44:50 +01:00
Manuel Raynaud
2319f06fd2 integrate Tpex componant 2013-02-18 22:58:46 +01:00
Manuel Raynaud
d4bc75bc12 integrate Thelia/Tpex 2013-02-18 21:40:59 +01:00
Manuel Raynaud
4764118f3a update propel in V.1.6.8 2013-02-18 14:39:45 +01:00
Manuel Raynaud
cfb2d00b13 add composer.lock and new documentation 2013-02-18 14:19:17 +01:00
Manuel Raynaud
ec35cf998e add class-loader component, needed for HttpKernel component in dev mode 2013-02-05 11:28:36 +01:00
Manuel Raynaud
9309c75e07 remove symfony classLoader component, using composer autoloader with
dump optimized option
2013-02-04 14:55:20 +01:00