Etienne Roudeix
ec7d4471dc
payment process
2013-09-19 15:59:16 +02:00
Etienne Roudeix
66536d0b31
Merge branch 'master' into template
...
Conflicts:
core/lib/Thelia/Core/Template/Loop/Product.php
2013-09-18 20:03:13 +02:00
Etienne Roudeix
891ebcd491
fix tests, edit reset_install.sh, manage payment modules, change debugbar namespace to theliadebugbar
2013-09-18 19:51:01 +02:00
Etienne Roudeix
16d0985718
payment modules
2013-09-18 17:06:08 +02:00
Etienne Roudeix
b8c2bdc8df
cheque module
2013-09-18 16:23:10 +02:00
Etienne Roudeix
45106f24bd
module image
2013-09-18 15:58:58 +02:00
Etienne Roudeix
9b37bbb862
module image
2013-09-18 11:20:29 +02:00
Manuel Raynaud
387c0d00c3
test if cache directory exists before launching debug bar
2013-09-18 09:34:48 +02:00
Etienne Roudeix
4e053d1a57
payment plugins
2013-09-18 09:20:03 +02:00
Etienne Roudeix
bb246b3205
fix test
2013-09-18 08:55:12 +02:00
Etienne Roudeix
0d1c6cf8cb
postage + invoice step
2013-09-17 19:47:10 +02:00
Manuel Raynaud
8122dc3084
Merge branch 'install_wizard'
2013-09-17 16:02:24 +02:00
Etienne Roudeix
84204cbf05
Merge branch 'master' into template
...
Conflicts:
core/lib/Thelia/Core/Template/Loop/Feed.php
2013-09-16 15:32:17 +02:00
gmorel
b3df29a788
Merge branch 'master' of https://github.com/thelia/thelia into install_wizard
...
# By Manuel Raynaud (19) and others
# Via Manuel Raynaud (7) and others
* 'master' of https://github.com/thelia/thelia: (29 commits)
feed loop is now countable
Change error page design
Add validation button on form
- Edit country view creation - Delete and edit modalbox creation - Countries routes management
Completed template management
fix faker
fix faker script
Working : Fixture : cleaning
debugbar log query also use Tlog
update CartAdd form
Working : Fixture : cleaning
Working : Coupon : Fix unit tests @todo refactor
force charset in sql files
Countries view and routing creation
save if producSaleElements is in promo or not
Finished Features management
add promo column in cart_item
dispatch event when default currency change
add return statement in clear cache method
create cache for config entity
...
2013-09-16 15:08:09 +02:00
gmorel
bca2b58e41
Merge master
2013-09-16 15:07:58 +02:00
Etienne Roudeix
c7b3aea7f0
cart integration
2013-09-16 14:31:34 +02:00
Manuel Raynaud
8a19b8ec71
fix faker script
2013-09-16 12:15:04 +02:00
Manuel Raynaud
541bd3a4da
debugbar log query also use Tlog
2013-09-16 11:59:56 +02:00
Manuel Raynaud
91f5cb12cd
Merge branch 'master' into template
2013-09-11 15:28:38 +02:00
Manuel Raynaud
769993cc96
add TimeDataCollector
2013-09-11 15:26:47 +02:00
Manuel Raynaud
1ec9e7486d
just add Propel information in phpDebugBar
2013-09-11 15:21:43 +02:00
Manuel Raynaud
ec24586232
add some information in propelcollector
2013-09-11 15:04:47 +02:00
Manuel Raynaud
fe8680ed76
refactor debugBar plugin
2013-09-10 22:15:55 +02:00
Manuel Raynaud
c4bc273ad5
save duration and memory in debugBar
2013-09-10 21:03:48 +02:00
Manuel Raynaud
04ec683021
add PropelDataCollector to debugbar, still missing some informations
2013-09-07 17:37:24 +02:00
Manuel Raynaud
b036f16437
integrate debugbar module
2013-09-07 16:39:52 +02:00
Manuel Raynaud
b067ef7dcc
create Delivery loop
2013-09-06 18:41:44 +02:00
Manuel Raynaud
2dee65727d
set good module delivery id in session
2013-09-06 16:12:57 +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
1ac5c86afd
move Loop Element from Tpex to Template namespace
2013-06-20 10:52:22 +02:00
Manuel Raynaud
20d1655c9d
rename plugins to modules
2013-05-16 11:13:09 +02:00
