Manuel Raynaud
|
7a2469cdc8
|
allow to create a customer in bakcoffice
|
2013-10-28 16:55:07 +01:00 |
|
Etienne Roudeix
|
2eb5fc821c
|
mailing sytem admin
|
2013-10-28 12:24:59 +01:00 |
|
Manuel Raynaud
|
51cd9f4ee8
|
Merge branch 'master' into frontend
Conflicts:
templates/default/layout.tpl
|
2013-10-25 14:51:34 +02:00 |
|
touffies
|
d9a2855084
|
Issue 79 : English error
|
2013-10-25 14:03:54 +02:00 |
|
Manuel Raynaud
|
de147b7b0c
|
change visibility parameter in content and folder loops
|
2013-10-25 12:24:47 +02:00 |
|
Manuel Raynaud
|
8196349ceb
|
change visibility parameter in category loop
|
2013-10-25 12:23:50 +02:00 |
|
Manuel Raynaud
|
e33ed5047f
|
check if email contact eists before sending emails
|
2013-10-25 11:52:46 +02:00 |
|
Manuel Raynaud
|
e26c8fdd7c
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-10-25 11:29:00 +02:00 |
|
Manuel Raynaud
|
7ca339492f
|
fix test suite
|
2013-10-25 11:21:39 +02:00 |
|
Etienne Roudeix
|
cc3aa39cae
|
fix product loop
|
2013-10-25 11:18:20 +02:00 |
|
Manuel Raynaud
|
0d8c4f97a1
|
return empty value instead of throwing an exception for format_number
smarty function
|
2013-10-25 10:54:53 +02:00 |
|
Manuel Raynaud
|
3c4525d6d6
|
fix product loop
|
2013-10-25 10:52:41 +02:00 |
|
Manuel Raynaud
|
936af2ec91
|
return empty value instead of throwing an exception for format_date
smarty function
|
2013-10-25 10:43:40 +02:00 |
|
Manuel Raynaud
|
2c030f910b
|
fix cs
|
2013-10-25 10:07:21 +02:00 |
|
Manuel Raynaud
|
0ef89a0e82
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-10-25 09:26:45 +02:00 |
|
Manuel Raynaud
|
373fe13287
|
save thelia version
|
2013-10-25 09:10:27 +02:00 |
|
Etienne Roudeix
|
8043b50c75
|
new permission system in controllers
|
2013-10-25 08:59:09 +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
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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
|
10f78b90a5
|
Merge pull request #49 from thelia/frontend
Frontend
|
2013-10-24 08:07:18 -07: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 |
|
Etienne Roudeix
|
ecaf0ccd07
|
consider FROM_DEFAULT_CURRENCY in pse loop
|
2013-10-24 15:23:16 +02:00 |
|