Commit Graph

1508 Commits

Author SHA1 Message Date
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
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
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
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
e8fd822795 add higher priority to module routing 2013-10-08 13:22:06 +02:00
Manuel Raynaud
43467681fd enabled change default country 2013-10-08 10:16:18 +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
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
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
Manuel Raynaud
51a307527c create coutry events 2013-10-07 10:50:44 +02:00
Manuel Raynaud
f408ad5d1f finish customer address update 2013-10-07 09:53:25 +02:00
Manuel Raynaud
9335002b88 Merge branch 'master' into customer 2013-10-07 09:45:28 +02:00
Manuel Raynaud
f44a870de5 Merge branch 'master' into customer 2013-10-07 09:16:25 +02:00
Manuel Raynaud
a4df1b7115 Merge pull request #8 from thelia/fixtures_for_modules
Allow fixtures in module
2013-10-07 00:16:02 -07:00
Manuel Raynaud
5d1cd35c32 check session directory permission in install process 2013-10-06 14:36:48 +02:00
Manuel Raynaud
77a4faef0e complete installcli process 2013-10-06 14:33:17 +02:00
Manuel Raynaud
666b19a6ff update address process 2013-10-04 17:33:48 +02:00
gmorel
52ab1c1b72 Working : Allow fixtures in module, refactor explode on sql file : add \n otherwise any ; in the db crashes everything 2013-10-04 16:52:29 +02:00
Manuel Raynaud
4ec9c54fbe start creating ajax loader for address update event 2013-10-03 18:02:03 +02:00
Manuel Raynaud
860a96cef5 put dedicated controller for address mangamenent 2013-10-03 16:31:15 +02:00
Manuel Raynaud
eeab96bde6 redirect to customer update template after removing address 2013-10-03 16:10:28 +02:00
Manuel Raynaud
fa45df3275 allow to delete customer address 2013-10-03 15:53:30 +02:00
Manuel Raynaud
c4d8b59b07 fix folder creation route 2013-10-03 14:33:45 +02:00
Manuel Raynaud
e902e331d1 add compass to assteic filters 2013-10-03 13:54:39 +02:00
Manuel Raynaud
abaf8e922c ifix asseticHelper sass filter 2013-10-03 12:40:51 +02:00
Manuel Raynaud
6e29325d19 create purchase order pdf 2013-10-03 10:45:21 +02:00
Manuel Raynaud
9fcbeab69c complete invoice pdf template 2013-10-02 18:03:25 +02:00