touffies
|
0fd024201e
|
Add violation to password if it's existing user
|
2013-10-16 10:34:07 +02:00 |
|
touffies
|
88ed4191ef
|
Fix conflict
|
2013-10-16 09:36:19 +02:00 |
|
touffies
|
1610ffab65
|
Merge branch 'frontend' of https://github.com/thelia/thelia into frontend
|
2013-10-16 09:33:42 +02:00 |
|
Manuel Raynaud
|
08776e5fc5
|
clean code
|
2013-10-15 21:52:35 +02:00 |
|
Manuel Raynaud
|
fb4d44545d
|
POC : add violation to password field
|
2013-10-15 21:45:46 +02:00 |
|
touffies
|
ca1587c6e7
|
Merge with Master
|
2013-10-15 11:05:05 +02:00 |
|
Manuel Raynaud
|
b7c0e040b3
|
add propel connection in transactions
|
2013-10-15 10:39:50 +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 |
|
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
|
75bc86d43e
|
complete admin log message
|
2013-10-14 12:40:09 +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
|
820a92c9c1
|
add pre/post methods in Area model
|
2013-10-14 11:26:13 +02:00 |
|
Manuel Raynaud
|
52b68df4bc
|
update area postage
|
2013-10-14 11:12:17 +02:00 |
|
Manuel Raynaud
|
8d4fa3b29b
|
add missinf files
|
2013-10-14 11:03:44 +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
|
669be89896
|
choices access through smarty
|
2013-10-11 16:09:36 +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
|
b8ebe90e3e
|
Add route for search Page
|
2013-10-11 13:10:14 +02:00 |
|
badsuricate
|
7e92fd40f3
|
Add filter Title on ProductLoop
|
2013-10-11 13:09:45 +02:00 |
|
Manuel Raynaud
|
319bb2f0b8
|
create all area events
|
2013-10-11 12:06:17 +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 |
|
Etienne Roudeix
|
c1a8c27dee
|
tax rule edition
|
2013-10-11 11:09:11 +02:00 |
|
Manuel Raynaud
|
275262c7dc
|
Merge branch 'master' into country
|
2013-10-11 11:07:02 +02:00 |
|
Manuel Raynaud
|
159441a1a9
|
normalize url generator cache class
|
2013-10-11 10:57:31 +02:00 |
|
Manuel Raynaud
|
560b80c182
|
refactor shipping object into area
|
2013-10-10 17:18:38 +02:00 |
|
touffies
|
a35d85a9b0
|
Use only one routing for /Login
|
2013-10-10 16:38:52 +02:00 |
|
Manuel Raynaud
|
9d6df61296
|
create form tag for shipping forms
|
2013-10-10 16:36:59 +02:00 |
|
Manuel Raynaud
|
23f9301279
|
create shipping create and modify forms
|
2013-10-10 16:26:26 +02:00 |
|
Manuel Raynaud
|
8856cec55c
|
create area loop and shipping conf events name
|
2013-10-10 16:18:51 +02:00 |
|
Manuel Raynaud
|
6bfca2c6b4
|
allow country update
|
2013-10-10 14:20:53 +02:00 |
|
touffies
|
ed1fe4064a
|
Merge branch 'frontend' of https://github.com/thelia/thelia into frontend
|
2013-10-10 11:49:53 +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 |
|
GOLEO Bruno
|
c22e519be4
|
Rename text : This email does not exists exists to This email does not exists
|
2013-10-09 14:25:06 +02:00 |
|
touffies
|
dca1831391
|
Merge branch 'master' into frontend
|
2013-10-09 13:29:48 +02:00 |
|
Manuel Raynaud
|
d8ec745fea
|
fix issue concerning absoluteUrl
|
2013-10-09 12:44:49 +02:00 |
|
touffies
|
7234b2e994
|
Merge master
|
2013-10-09 12:26:10 +02:00 |
|
Manuel Raynaud
|
5d0eb4e61e
|
do not display some information about template file
|
2013-10-09 10:34:35 +02:00 |
|