403 Commits

Author SHA1 Message Date
Marion Muszynski
fb7a9616ff Merge branch 'ticket-7768-UpdateSAV' into develop 2016-11-25 10:53:08 +01:00
Marion Muszynski
5d963638fa fix 2016-11-25 10:52:50 +01:00
Marion Muszynski
3a630a0d93 Merge branch 'ticket-7768-UpdateSAV' into develop 2016-11-25 10:49:27 +01:00
Marion Muszynski
0e6992f29b changement delivery date estimation 2016-11-25 10:49:10 +01:00
Marion Muszynski
7295412f54 Merge branch 'ticket-10657-SentenceBoxAddToCart' into develop 2016-11-24 12:14:06 +01:00
Marion Muszynski
ef27ddd7af changement sentences according delivery delay 2016-11-24 11:59:20 +01:00
Marion Muszynski
40960bf54e Merge branch 'fix-AideContact' into develop 2016-11-15 10:29:12 +01:00
Marion Muszynski
684d096c48 modif css and redirection to the good form 2016-11-15 10:28:52 +01:00
Marion Muszynski
2645434803 openning to customers 2016-11-14 14:38:23 +01:00
Marion Muszynski
e996d5fcf6 Merge branch 'ticket-11513-newDelay' into develop 2016-11-07 15:43:51 +01:00
Marion Muszynski
57c1043e3a small fix 2016-11-07 15:43:36 +01:00
Marion Muszynski
9b4f712659 Merge branch 'ticket-11513-newDelay' into develop 2016-11-07 15:42:14 +01:00
Marion Muszynski
962fac493e fixin product tpl 2016-11-07 15:41:52 +01:00
Marion Muszynski
853ae921ec fix conflict 2016-11-07 15:30:22 +01:00
Marion Muszynski
ef7467f787 addition of a new delay for xmas 2016-11-07 15:28:43 +01:00
Marion Muszynski
10c666cc1b Merge branch 'ticket-ChangeDeliveryAddress' 2016-11-07 10:59:02 +01:00
Marion Muszynski
3946f6ceac fix conflict 2016-11-02 12:43:27 +01:00
Marion Muszynski
ede0f691a8 fix conflicts 2016-11-02 12:11:44 +01:00
Marion Muszynski
4ad4ae47bc Merge branch 'ticket-AideContact-SAV' into develop 2016-10-24 18:34:13 +02:00
Marion Muszynski
cb3e299efc addition of multi product choice 2016-10-24 18:33:51 +02:00
Marion Muszynski
179771c5df Merge branch 'fix-paypal' into develop 2016-10-18 13:02:52 +02:00
Marion Muszynski
5f8d23c3b1 open save paypal 2016-10-18 13:02:35 +02:00
Marion Muszynski
1f5d683f4b fix conflict 2016-10-18 12:58:26 +02:00
Marion Muszynski
1abe8d0fbd hide paypal billing 2016-10-17 17:37:23 +02:00
Marion Muszynski
72a789159a Merge branch 'ticket-ChangeDeliveryAddress' into develop 2016-10-13 15:53:46 +02:00
Marion Muszynski
e8bb0d7eac css addition and fixes 2016-10-13 15:53:23 +02:00
Marion Muszynski
385561fc7c fix conflcit 2016-10-12 12:42:41 +02:00
Marion Muszynski
2769bf42fd addition of delivery modifier link 2016-10-11 14:47:30 +02:00
Marion Muszynski
da8f9e0c1f Merge branch 'ticket-GAnalytics' 2016-10-10 10:38:46 +02:00
Marion Muszynski
5cf27fac91 adjusting carrier name sent to GA 2016-10-10 10:38:22 +02:00
Marion Muszynski
401db0a5b2 Merge branch 'ticket-GAnalytics' 2016-10-10 10:19:57 +02:00
Marion Muszynski
ba150d8ed9 adjusting payment type sent to GA 2016-10-10 10:19:40 +02:00
Marion Muszynski
46deb152f6 Merge branch 'ticket-GAnalytics' 2016-10-07 15:14:07 +02:00
Marion Muszynski
7fb403426b Merge branch 'ticket-GAnalytics' into develop 2016-10-07 15:11:45 +02:00
Marion Muszynski
88e42535a7 fix redirect 2016-10-07 15:11:25 +02:00
Marion Muszynski
b50bcf4848 fix conflict 2016-10-07 15:05:20 +02:00
Marion Muszynski
0f666b08fc fix when ga is blocked 2016-10-07 15:03:45 +02:00
Marion Muszynski
797b0e499f Merge branch 'ticket-GAnalytics' 2016-10-07 13:57:15 +02:00
Marion Muszynski
2b7ee09f88 fix 2016-10-07 13:57:01 +02:00
Marion Muszynski
46cae17534 fix conflict 2016-10-06 16:00:32 +02:00
Marion Muszynski
71a4bcdd52 fix name of payment type 2016-10-06 15:58:50 +02:00
Marion Muszynski
31bea61242 fix conflict 2016-10-06 15:29:09 +02:00
Marion Muszynski
973fb9bdf1 Merge branch 'ticket-GAnalytics' into develop 2016-10-06 15:25:44 +02:00
Marion Muszynski
016fbd8353 small fix 2016-10-06 15:25:25 +02:00
Marion Muszynski
79b0ca62cd fix conflict 2016-10-06 11:56:59 +02:00
Marion Muszynski
4f446ca296 continuation of ant_support and sav 2016-10-06 11:55:13 +02:00
Marion Muszynski
e6fdac5dbe Merge branch 'ticket-8048' 2016-09-28 16:57:04 +02:00
Marion Muszynski
5355871476 Merge branch 'ticket-8048' into develop 2016-09-28 14:06:59 +02:00
Rodney Figaro
da5a017c06 add scrolling/slide when products have more than 3 accessories 2016-09-28 12:44:25 +02:00
Marion Muszynski
2f21284be4 fix conflict 2016-09-27 10:34:47 +02:00