Etienne Roudeix
|
8043b50c75
|
new permission system in controllers
|
2013-10-25 08:59:09 +02:00 |
|
Manuel Raynaud
|
ee1ba49aa8
|
change thelia url in composer.json file
|
2013-10-25 01:13:30 +02:00 |
|
Manuel Raynaud
|
ebba25a7d0
|
create contributors file
|
2013-10-25 01:01:41 +02:00 |
|
Franck Allimant
|
d9fc945015
|
Added TAX_RUl_ID to simple part of product loop
|
2013-10-25 00:46:25 +02:00 |
|
Franck Allimant
|
eccad09abe
|
Merge branch 'catalog'
|
2013-10-25 00:36:24 +02:00 |
|
Franck Allimant
|
0d50557269
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-10-25 00:33:52 +02:00 |
|
Franck Allimant
|
06cc8ce1ea
|
Finished product combinations edition
|
2013-10-25 00:32:56 +02:00 |
|
Manuel Raynaud
|
60683b7a32
|
Merge pull request #56 from thelia/frontend
Wrong name form used into updateAction (CustomerController)
|
2013-10-24 12:56:37 -07:00 |
|
touffies
|
29c2d543fb
|
Wrong name form used into updateAction (CustomerController)
|
2013-10-24 21:39:50 +02:00 |
|
Manuel Raynaud
|
a85c0a75cf
|
Merge pull request #55 from thelia/frontend
Frontend
|
2013-10-24 12:31:42 -07:00 |
|
Manuel Raynaud
|
b8751b26a5
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-10-24 21:25:41 +02:00 |
|
Manuel Raynaud
|
dfbdce3f80
|
send order confirmation email
|
2013-10-24 21:24:14 +02:00 |
|
touffies
|
29c7d077c6
|
Wrong form name
thelia.admin.customer.modification
replaced by
thelia.admin.customer.update
|
2013-10-24 21:12:32 +02:00 |
|
Etienne Roudeix
|
a0b59c8549
|
Merge branch 'tax'
|
2013-10-24 20:26:26 +02:00 |
|
Etienne Roudeix
|
d8611c2965
|
admin search in customer and products
|
2013-10-24 20:26:00 +02:00 |
|
Manuel Raynaud
|
f6b65e70d9
|
create order confirmation email
|
2013-10-24 20:23:43 +02:00 |
|
touffies
|
54eda797a2
|
Replace /login and /register by /logout and /account in the footer if the customer is logged in
|
2013-10-24 19:56:15 +02:00 |
|
Manuel Raynaud
|
97d3be6104
|
fix AdminResources constant in MessageController
|
2013-10-24 19:52:09 +02:00 |
|
Etienne Roudeix
|
6ea61ff68c
|
searchLoopInterface + use in OrderLoop
|
2013-10-24 19:50:09 +02:00 |
|
touffies
|
64985faedc
|
small fix
|
2013-10-24 19:49:52 +02:00 |
|
Manuel Raynaud
|
72f9cbb305
|
save website url in install process
|
2013-10-24 19:45:51 +02:00 |
|
touffies
|
d8b2ef28fc
|
Issue 51, removed s at account information
|
2013-10-24 19:45:30 +02:00 |
|
touffies
|
b0fb0fdd43
|
I need the route cart.view for the OrderException.php file.
|
2013-10-24 19:39:54 +02:00 |
|
Manuel Raynaud
|
bba21b2a94
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-10-24 19:20:18 +02:00 |
|
Manuel Raynaud
|
1f3315a3ec
|
Merge pull request #54 from thelia/frontend
Change some route to use the default
|
2013-10-24 10:18:03 -07:00 |
|
touffies
|
ca5d7d2a00
|
Change some route to use the default
$this->redirectToRoute('default', array('view'=>'cart'));
|
2013-10-24 18:51:49 +02:00 |
|
Manuel Raynaud
|
a327c98671
|
fix admin order pdf routes
|
2013-10-24 18:28:02 +02:00 |
|
Manuel Raynaud
|
9965b6a7a7
|
remove link on product images in invoice page
|
2013-10-24 17:52:06 +02:00 |
|
Etienne Roudeix
|
32725832f1
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-10-24 17:42:22 +02:00 |
|
Etienne Roudeix
|
2dc4589126
|
non-complex product loop returns default PSE
|
2013-10-24 17:41:32 +02:00 |
|
Manuel Raynaud
|
91f2920336
|
remove http cache
|
2013-10-24 17:35:17 +02:00 |
|
Manuel Raynaud
|
9cd986d3b6
|
fix issue #53
|
2013-10-24 17:33:35 +02:00 |
|
Manuel Raynaud
|
d1cccb13cb
|
remove some links in admin config part
|
2013-10-24 17:28:50 +02:00 |
|
Etienne Roudeix
|
5b008a8b17
|
Merge branch 'master' into loops
|
2013-10-24 17:15:48 +02:00 |
|
Etienne Roudeix
|
c3fe31c0af
|
new product loop
|
2013-10-24 17:15:16 +02:00 |
|
Manuel Raynaud
|
a25249439f
|
remove phpinfo file
|
2013-10-24 17:12:04 +02:00 |
|
Manuel Raynaud
|
10f78b90a5
|
Merge pull request #49 from thelia/frontend
Frontend
|
2013-10-24 08:07:18 -07:00 |
|
Franck Allimant
|
87df547668
|
Removed var_dump(à
|
2013-10-24 17:01:10 +02:00 |
|
Franck Allimant
|
54f2172ca1
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-10-24 16:56:52 +02:00 |
|
Franck Allimant
|
d0213f36d4
|
Removed forgotten var_dump().
|
2013-10-24 16:56:14 +02:00 |
|
Manuel Raynaud
|
9b5c631fcb
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-10-24 16:55:09 +02:00 |
|
Manuel Raynaud
|
0be7285863
|
save discount
|
2013-10-24 16:54:52 +02:00 |
|
touffies
|
ebec82d1d2
|
Merge with master
|
2013-10-24 16:52:03 +02:00 |
|
Franck Allimant
|
db6d5692eb
|
Merge branch 'catalog'
Conflicts:
local/config/schema.xml
|
2013-10-24 16:47:53 +02:00 |
|
Franck Allimant
|
4f7e7660ca
|
Finished PSE management for products with no combinations
|
2013-10-24 16:39:22 +02:00 |
|
Manuel Raynaud
|
2f7dcb7f51
|
remove tooltip from coupon edit controller
|
2013-10-24 15:55:35 +02:00 |
|
badsuricate
|
1d92ac0626
|
Merge branch 'frontend' of github.com:thelia/thelia into frontend
|
2013-10-24 15:31:46 +02:00 |
|
badsuricate
|
e0a927daf1
|
Add 404 Page
|
2013-10-24 15:31:12 +02:00 |
|
Etienne Roudeix
|
ecaf0ccd07
|
consider FROM_DEFAULT_CURRENCY in pse loop
|
2013-10-24 15:23:16 +02:00 |
|
Etienne Roudeix
|
7b9585b11b
|
consider FROM_DEFAULT_CURRENCY field in product loop
|
2013-10-24 15:15:29 +02:00 |
|