2844 Commits

Author SHA1 Message Date
Michael RICOIS
2437dd9d04 Merge branch 'ticket-14805-creditexpiration' 2017-11-29 16:30:30 +01:00
Michael RICOIS
67c0de286a Remove use discount 2017-11-29 16:24:45 +01:00
Michael RICOIS
f0772aa345 Merge branch 'ticket-14805-creditexpiration' 2017-11-29 14:48:19 +01:00
Marion Muszynski
732ea19b30 deleting useless files 2017-11-29 14:48:16 +01:00
Marion Muszynski
2221c2e6d3 add module ant logistic for test 2017-11-29 14:46:02 +01:00
Michael RICOIS
94437d7043 Remove comment 2017-11-29 14:40:23 +01:00
Michael RICOIS
02fc21cd8d Ready to test 2017-11-29 12:33:11 +01:00
Michael RICOIS
e4fa94dcf8 Protect directory 2017-11-29 12:23:19 +01:00
Michael RICOIS
cc26558cae Mail language 2017-11-29 12:22:58 +01:00
Michael RICOIS
699ff5d806 Reprise script original 2017-11-29 11:27:44 +01:00
Marion Muszynski
37d038dd27 Merge branch 'ticket-14828-ChangeIdContactDynamically' 2017-11-29 11:17:57 +01:00
Michael RICOIS
580621fc43 cli to send reminder mail 2017-11-29 11:12:32 +01:00
Michael RICOIS
12f3324995 Dedicated FR Tag 2017-11-28 17:18:26 +01:00
Michael RICOIS
eae8fac9ea Prepare mail template 2017-11-28 17:14:55 +01:00
Michael RICOIS
81ed63f2fb Prepare script 2017-11-28 17:14:35 +01:00
Nolwenn J
cf6ca990ae fixs 2017-11-28 14:47:31 +01:00
Michael RICOIS
39d6b1659e Merge branch 'ticket-14525-parrain' 2017-11-28 11:50:53 +01:00
Michael RICOIS
c6b1e3b1e3 Update if customer email is already sponsor before he's registring 2017-11-28 11:48:14 +01:00
Michael RICOIS
12b545c7a7 Disable Tag Categories 2017-11-28 10:33:51 +01:00
Michael RICOIS
6c0ce3ca13 Merge branch 'ticket-14525-parrain' 2017-11-28 10:16:55 +01:00
Michael RICOIS
d4485178f0 Add error message 2017-11-28 10:11:34 +01:00
Marion Muszynski
50ad39bf5f Merge branch 'feature/override_object_model' into 'master'
Feature/override object model

See merge request dev-antadis/bebeboutik!9
2017-11-27 11:46:14 +01:00
Marion Muszynski
10c3debe27 redirect when contact is to cancel an already sent order 2017-11-27 11:07:02 +01:00
Marion Muszynski
74ef1e3173 Merge branch 'ticket-14829-FixEmails' 2017-11-27 10:45:22 +01:00
Marion Muszynski
1abc3499b9 Merge branch 'ticket-14836-refonteProductMobile' 2017-11-27 10:41:53 +01:00
Michael RICOIS
15d66ca8b3 Brand, Category, Family 2017-11-24 17:17:12 +01:00
Christophe LATOUR
8ef9b301ca adding comment 2017-11-24 16:37:42 +01:00
Christophe LATOUR
283457bd5c Overriding Objectmodel :
- replace self with static to be able to override displayFieldName
2017-11-24 16:24:38 +01:00
Marion Muszynski
1932ff578d fix inte on product page 2017-11-23 17:08:29 +01:00
Marion Muszynski
64251e2fb9 addition of fonts 2017-11-23 16:49:57 +01:00
Marion Muszynski
cfed6df5d4 inte for site_mobile theme 2017-11-23 16:48:44 +01:00
Marion Muszynski
58a1710ea2 check if order is sended and change id contact accordingly 2017-11-23 15:31:47 +01:00
root
59f0826643 fixes for philea from prod 2017-11-23 15:06:35 +01:00
root
78bd7eb479 fixes from prod 2017-11-23 15:05:07 +01:00
Michael RICOIS
76b471851d Style 2017-11-23 11:43:08 +01:00
Michael RICOIS
5a91df071e Active sensefuel on all pages 2017-11-23 11:42:55 +01:00
Marion Muszynski
4044bc329c add email fixes 2017-11-23 11:10:24 +01:00
Michael RICOIS
11c352a89d Centrage 2017-11-22 18:22:34 +01:00
Michael RICOIS
a2bebdb825 Style 2017-11-22 17:45:40 +01:00
Marion Muszynski
3f9a62487a Merge branch 'ticket-14436-WP' 2017-11-22 16:33:45 +01:00
Marion Muszynski
8ae9fb7dd2 fix 2017-11-22 16:31:51 +01:00
Michael RICOIS
eaef2702d2 Place holder 2017-11-22 15:00:01 +01:00
Michael RICOIS
bbe1ec73e2 Breadcrumb 2017-11-22 14:44:25 +01:00
Michael RICOIS
56806d37df Style to display background 2017-11-22 13:03:23 +01:00
Michael RICOIS
60f7126f42 Background 2017-11-22 12:48:38 +01:00
Michael RICOIS
364d14e73c Change display condition 2017-11-22 12:37:10 +01:00
Nolwenn J
bfae062c0c mails fixs 2017-11-22 11:33:50 +01:00
Nolwenn J
b46cf8580d fix mail es 2017-11-22 11:12:27 +01:00
Nolwenn J
2724d07b5b mails 2017-11-22 11:08:26 +01:00
Nolwenn J
bbeef7850d fix 2017-11-22 10:46:35 +01:00