Commit Graph

857 Commits

Author SHA1 Message Date
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
gmorel
55c60ed89e Working : Coupon : add WYSIWYG 2013-10-10 23:00:36 +02:00
Kahn
7f59c8a954 Merge branch 'master' of https://github.com/thelia/thelia into coupon
* 'master' of https://github.com/thelia/thelia:
  fix issue concerning absoluteUrl
  do not display some information about template file
  escape view parameter
2013-10-10 22:12:42 +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
Kahn
5aa6ce12a9 Merge branch 'master' of https://github.com/thelia/thelia into coupon
* 'master' of https://github.com/thelia/thelia: (102 commits)
  add higher priority to module routing
  update smarty version
  select default country in front register form
  add modal error id changing default country failed
  enabled change default country
  fiw module generator class name issue
  complete javascript for changing default country
  validate country removal
  validate country creation
  implement abstract method from AbstractCrudController in Country Controller
  create country action class
  add pre/post CRUD method in Country model
  create coutry events
  finish customer address update
  complete readme
  update .gitignore file
  add specifig php.ini file for travis
  try to fix travis conf
  remove unused directory
  check session directory permission in install process
  ...
2013-10-08 23:22:53 +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
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
Etienne Roudeix
0efb01220c add tax admin css 2013-10-07 11:06:54 +02:00
Manuel Raynaud
51a307527c create coutry events 2013-10-07 10:50:44 +02:00
Etienne Roudeix
4a0403040c add tax files 2013-10-07 10:46:12 +02:00
touffies
35b1ed6c04 Optimisation : Use only one file for bootstrap 2013-10-07 10:15:06 +02:00
Manuel Raynaud
f408ad5d1f finish customer address update 2013-10-07 09:53:25 +02:00