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
|
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
|
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 |
|
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 |
|
touffies
|
ed1fe4064a
|
Merge branch 'frontend' of https://github.com/thelia/thelia into frontend
|
2013-10-10 11:49: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 |
|
badsuricate
|
d72e580c59
|
Merge branch 'frontend' of github.com:thelia/thelia into frontend
|
2013-10-09 14:58:19 +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 |
|
touffies
|
11e0091c0b
|
Text : correction search title
|
2013-10-09 12:58:16 +02:00 |
|
Manuel Raynaud
|
d8ec745fea
|
fix issue concerning absoluteUrl
|
2013-10-09 12:44:49 +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
|
5d0eb4e61e
|
do not display some information about template file
|
2013-10-09 10:34:35 +02:00 |
|
Etienne Roudeix
|
52a582435e
|
tax rule modification
|
2013-10-09 10:16:46 +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
|
e8fd822795
|
add higher priority to module routing
|
2013-10-08 13:22:06 +02:00 |
|
Manuel Raynaud
|
32764b25c3
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-10-08 12:27:02 +02:00 |
|
Manuel Raynaud
|
e2f975923e
|
update smarty version
|
2013-10-08 12:20:43 +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 |
|
Manuel Raynaud
|
29737392b3
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-10-08 09:44:47 +02:00 |
|
Manuel Raynaud
|
d45074051e
|
fiw module generator class name issue
|
2013-10-07 17:43:43 +02:00 |
|
Etienne Roudeix
|
942638281a
|
tax edition
|
2013-10-07 17:18:38 +02:00 |
|
Etienne Roudeix
|
b84e863033
|
fix tests
|
2013-10-07 14:36:20 +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 |
|
touffies
|
fe5b72202c
|
Add Bootbox.js (Extend the Bootstrap dialog for confirm and alert)
|
2013-10-07 11:45:03 +02:00 |
|
touffies
|
d6e09b4840
|
Optimization : User only 1 file for Bootstrap js
|
2013-10-07 11:43:59 +02:00 |
|
Manuel Raynaud
|
0f1dee978c
|
implement abstract method from AbstractCrudController in Country
Controller
|
2013-10-07 11:34:29 +02:00 |
|
Etienne Roudeix
|
0efb01220c
|
add tax admin css
|
2013-10-07 11:06:54 +02:00 |
|
Manuel Raynaud
|
3b20d5baf5
|
create country action class
|
2013-10-07 11:00:26 +02:00 |
|
Manuel Raynaud
|
ea94a54280
|
add pre/post CRUD method in Country model
|
2013-10-07 10:59:58 +02:00 |
|