Manuel Raynaud
|
d6e26e428e
|
Merge branch 'master' into frontend
Conflicts:
core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
templates/admin/default/tax-rule-edit.html
templates/admin/default/taxes-rules.html
|
2013-10-18 16:41:39 +02:00 |
|
touffies
|
d204a32c09
|
Merge branch 'frontend' of https://github.com/thelia/thelia into frontend
|
2013-10-18 12:43:27 +02:00 |
|
badsuricate
|
cab914bb64
|
Add button "add product to cart"
|
2013-10-18 10:55:47 +02:00 |
|
badsuricate
|
3db29c9d1d
|
Creation of Content page
|
2013-10-18 10:51:52 +02:00 |
|
touffies
|
5fdebe4d2e
|
Empty cart + Intl
|
2013-10-16 15:13:04 +02:00 |
|
Manuel Raynaud
|
b3c761798b
|
fix menu when child > 0
|
2013-10-16 11:45:18 +02:00 |
|
badsuricate
|
8d15d161fb
|
Creation of "include/mini-cart.html"
|
2013-10-16 09:51:48 +02:00 |
|
badsuricate
|
7602ddc962
|
Rename category-toolbar to toolbar
|
2013-10-11 13:12:38 +02:00 |
|
Manuel Raynaud
|
1a962d701d
|
translate some missing string
|
2013-09-20 16:31:25 +02:00 |
|
Manuel Raynaud
|
bb40086e2a
|
allow to order products on category page
|
2013-09-20 13:59:51 +02:00 |
|
Manuel Raynaud
|
16de9bbcc9
|
allow displaying how much product wanted in category page
|
2013-09-20 09:19:12 +02:00 |
|
Manuel Raynaud
|
c255548d9b
|
create dedicated file for menu
|
2013-09-20 08:45:38 +02:00 |
|
Manuel Raynaud
|
24f17bcb0f
|
fix count child on folder and category folder. Doubitch
|
2013-09-19 20:24:33 +02:00 |
|
Manuel Raynaud
|
a540626fff
|
fix product import
|
2013-09-19 18:47:12 +02:00 |
|
Manuel Raynaud
|
02d758ae9a
|
start integration default template
|
2013-09-09 17:30:18 +02:00 |
|
Manuel Raynaud
|
5315e13ce9
|
add new event and new tag
|
2013-09-07 16:31:15 +02:00 |
|
franck
|
6867eae9b7
|
Fixed customer front controller, events, addec admion config.
|
2013-08-30 19:46:12 +02:00 |
|
franck
|
9a1ee565de
|
changed role names to XXXX instead of ROLE_XXXX
|
2013-07-18 13:01:33 +02:00 |
|
franck
|
10bf529f59
|
Removed obsolete templates
|
2013-07-17 19:02:33 +02:00 |
|
franck
|
8296051937
|
Implemented front-office login
|
2013-07-17 18:49:23 +02:00 |
|