Commit Graph

1979 Commits

Author SHA1 Message Date
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
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
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
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
Manuel Raynaud
9335002b88 Merge branch 'master' into customer 2013-10-07 09:45:28 +02:00
Manuel Raynaud
75ea47d120 Merge branch 'master' of github.com:thelia/thelia 2013-10-07 09:44:11 +02:00
Manuel Raynaud
db3bf14ea7 complete readme 2013-10-07 09:37:19 +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
d7b3d536b0 update .gitignore file 2013-10-06 15:30:36 +02:00
Manuel Raynaud
180d3a948c add specifig php.ini file for travis 2013-10-06 15:05:35 +02:00
Manuel Raynaud
0b68d983b0 try to fix travis conf 2013-10-06 14:57:32 +02:00
Manuel Raynaud
cca7414f80 remove unused directory 2013-10-06 14:38:38 +02:00
Manuel Raynaud
5d1cd35c32 check session directory permission in install process 2013-10-06 14:36:48 +02:00
Manuel Raynaud
7f7bb595c5 ignore new content in web/cache 2013-10-06 14:34:40 +02:00
Manuel Raynaud
ac1a3ce143 indexes web/cache directory 2013-10-06 14:33:47 +02:00
Manuel Raynaud
77a4faef0e complete installcli process 2013-10-06 14:33:17 +02:00
Manuel Raynaud
f4bff3fdc9 send 403 response if clientdon't have trusted IP 2013-10-05 10:51:32 +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