touffies
|
1610ffab65
|
Merge branch 'frontend' of https://github.com/thelia/thelia into frontend
|
2013-10-16 09:33:42 +02:00 |
|
touffies
|
ca1587c6e7
|
Merge with Master
|
2013-10-15 11:05:05 +02:00 |
|
Manuel Raynaud
|
b94de977a1
|
Merge branch 'country'
|
2013-10-14 17:47:29 +02:00 |
|
Manuel Raynaud
|
1aea868785
|
remove area to area_delivery_module
|
2013-10-14 17:45:23 +02:00 |
|
Manuel Raynaud
|
3c94c9c513
|
add an area to a delivery module
|
2013-10-14 17:23:20 +02:00 |
|
Manuel Raynaud
|
9ea86be123
|
create shipping zone area form
|
2013-10-14 16:20:16 +02:00 |
|
badsuricate
|
ec4bf3d7bd
|
Merge branch 'frontend' of github.com:thelia/thelia into frontend
|
2013-10-14 14:36:17 +02:00 |
|
badsuricate
|
d1d234919b
|
Modification of Product for display good informations about the product
|
2013-10-14 14:35:11 +02:00 |
|
Manuel Raynaud
|
9c4c63a564
|
start shipping zone management
|
2013-10-14 14:08:50 +02:00 |
|
touffies
|
94bcf9a191
|
Merge conflict
|
2013-10-14 12:53:01 +02:00 |
|
Manuel Raynaud
|
97887f1d54
|
allow to create a new area
|
2013-10-14 12:28:30 +02:00 |
|
touffies
|
4441fc8190
|
Change path to the register page
|
2013-10-14 12:25:46 +02:00 |
|
touffies
|
7695c19b40
|
Login action :
* Add account
* If user has checked "I'm a new customer", we must verify if it's a new email address.
|
2013-10-14 12:25:12 +02:00 |
|
Manuel Raynaud
|
4671132964
|
delete area
|
2013-10-14 11:40:37 +02:00 |
|
Manuel Raynaud
|
998e1369a5
|
display error message
|
2013-10-14 11:15:08 +02:00 |
|
Manuel Raynaud
|
52b68df4bc
|
update area postage
|
2013-10-14 11:12:17 +02:00 |
|
Manuel Raynaud
|
b371f5c54c
|
remove country from area and start creating postage management
|
2013-10-14 11:03:13 +02:00 |
|
Manuel Raynaud
|
dfee7e87a6
|
add country to as area
|
2013-10-14 10:04:08 +02:00 |
|
Manuel Raynaud
|
97ce036cbe
|
start area configuration tempalte
|
2013-10-11 17:23:40 +02:00 |
|
Manuel Raynaud
|
4aed59693a
|
complete AreaController
|
2013-10-11 16:48:15 +02:00 |
|
Etienne Roudeix
|
c84e451a12
|
tax rule creation
|
2013-10-11 13:51:30 +02:00 |
|
badsuricate
|
b5f57a4819
|
Merge branch 'frontend' of github.com:thelia/thelia into frontend
|
2013-10-11 13:13:07 +02:00 |
|
badsuricate
|
7602ddc962
|
Rename category-toolbar to toolbar
|
2013-10-11 13:12:38 +02:00 |
|
badsuricate
|
6d5768c16f
|
Add search page
|
2013-10-11 13:08:15 +02:00 |
|
Etienne Roudeix
|
2c88471ef3
|
Merge branch 'master' into tax
|
2013-10-11 11:13:41 +02:00 |
|
Etienne Roudeix
|
763026700d
|
tax rule edition
|
2013-10-11 11:09:23 +02:00 |
|
touffies
|
d58f63990a
|
Remove path.less in thelia's folder
|
2013-10-10 16:41:50 +02:00 |
|
touffies
|
3092c260b1
|
Remove alert
|
2013-10-10 16:40:44 +02:00 |
|
touffies
|
4885bfe815
|
Merge branch 'frontend' of https://github.com/thelia/thelia into frontend
|
2013-10-10 16:26:07 +02:00 |
|
Manuel Raynaud
|
8856cec55c
|
create area loop and shipping conf events name
|
2013-10-10 16:18:51 +02:00 |
|
touffies
|
2cce95658f
|
Add mini login form in the main navigation
|
2013-10-10 16:07:03 +02:00 |
|
badsuricate
|
303094055d
|
Add hover effect on items menu
|
2013-10-10 15:05:34 +02:00 |
|
Manuel Raynaud
|
6bfca2c6b4
|
allow country update
|
2013-10-10 14:20:53 +02:00 |
|
Etienne Roudeix
|
c4b78966c7
|
stringify taxes in tax rule edition
|
2013-10-09 17:02:18 +02:00 |
|
Etienne Roudeix
|
77c9c596f1
|
preselected countries is tax rule edition appliance
|
2013-10-09 16:15:53 +02:00 |
|
Etienne Roudeix
|
a8594ef6af
|
tax rule edition admin
|
2013-10-09 15:03:07 +02:00 |
|
touffies
|
11e0091c0b
|
Text : correction search title
|
2013-10-09 12:58:16 +02:00 |
|
touffies
|
778fa9e4b5
|
Change integration - Add mini cart
|
2013-10-09 12:31:40 +02:00 |
|
touffies
|
7234b2e994
|
Merge master
|
2013-10-09 12:26:10 +02:00 |
|
Manuel Raynaud
|
d866ffaaf5
|
escape view parameter
|
2013-10-09 09:05:48 +02:00 |
|
Etienne Roudeix
|
0f6951bc21
|
tax rule update and delation
|
2013-10-08 16:02:58 +02:00 |
|
Manuel Raynaud
|
a7a663ebb8
|
select default country in front register form
|
2013-10-08 10:56:22 +02:00 |
|
Manuel Raynaud
|
7b14736716
|
add modal error id changing default country failed
|
2013-10-08 10:48:51 +02:00 |
|
Manuel Raynaud
|
43467681fd
|
enabled change default country
|
2013-10-08 10:16:18 +02:00 |
|
Etienne Roudeix
|
942638281a
|
tax edition
|
2013-10-07 17:18:38 +02:00 |
|
Manuel Raynaud
|
342a1f2486
|
complete javascript for changing default country
|
2013-10-07 14:17:18 +02:00 |
|
Manuel Raynaud
|
ae887f6a67
|
validate country removal
|
2013-10-07 13:03:28 +02:00 |
|
Manuel Raynaud
|
65d23db854
|
validate country creation
|
2013-10-07 12:46:40 +02:00 |
|
Etienne Roudeix
|
fe3aea4ab7
|
tax types
|
2013-10-07 11:57:43 +02:00 |
|
touffies
|
53f2a33764
|
Merge Master
|
2013-10-07 11:50:20 +02:00 |
|