1699 Commits

Author SHA1 Message Date
Marion Muszynski
ff124b514a fix bg in lp 2017-05-17 16:48:11 +02:00
Marion Muszynski
633b163638 fix gclid in redirection 2017-05-17 16:04:42 +02:00
Marion Muszynski
96cb372568 Merge branch 'add-LogPaybox' into develop 2017-05-17 11:33:01 +02:00
Marion Muszynski
57fc9bff52 add log to follow direct payments 2017-05-17 11:32:39 +02:00
Marion Muszynski
5a13f29a16 Merge branch 'ticket-13166-ReturnProcess' into develop 2017-05-15 14:44:48 +02:00
Marion Muszynski
931eea448a fix order date 2017-05-15 14:44:31 +02:00
Marion Muszynski
50e9168a7b Merge branch 'ticket-13166-ReturnProcess' into develop 2017-05-15 14:42:56 +02:00
Marion Muszynski
65c8eea146 load last conv even if it s not about the order 2017-05-15 14:42:30 +02:00
Marion Muszynski
3c258749f9 Merge branch 'ticket-13166-ReturnProcess' into develop 2017-05-15 13:57:51 +02:00
Marion Muszynski
7aa63553b4 continuing and fix 2017-05-15 13:57:37 +02:00
Marion Muszynski
66edf98c06 Merge branch 'ticket-13166-ReturnProcess' into develop 2017-05-12 15:00:32 +02:00
Marion Muszynski
214082433c fix size table 2017-05-12 15:00:20 +02:00
Marion Muszynski
c44e1eb95d Merge branch 'ticket-13166-ReturnProcess' into develop 2017-05-12 14:57:29 +02:00
Marion Muszynski
ddd066a662 continuing with refund part 2017-05-12 14:57:13 +02:00
root
c5a3c5af91 fix from prod on a cron 2017-05-12 12:18:24 +02:00
Marion Muszynski
eb150cc17d Merge branch 'ticket-13248-ZeroQuantity' into develop 2017-05-12 12:04:44 +02:00
Marion Muszynski
e46f547c53 fix cron_discount and add cron to reorder braderi 2017-05-12 12:04:28 +02:00
Marion Muszynski
9180ded3e1 continuing refunding part 2017-05-12 11:12:07 +02:00
Marion Muszynski
66797776a2 Merge branch 'ticket-13166-ReturnProcess' into develop 2017-05-11 17:43:39 +02:00
Marion Muszynski
5ff5c296f5 contuning 2017-05-11 17:43:23 +02:00
Marion Muszynski
13f963acaa Merge branch 'ticket-13166-ReturnProcess' into develop 2017-05-11 15:48:58 +02:00
Marion Muszynski
ae78a0b870 continuing 2017-05-11 15:48:43 +02:00
Marion Muszynski
f30ce559c9 Merge branch 'ticket-13166-ReturnProcess' into develop 2017-05-11 12:54:29 +02:00
Marion Muszynski
825cd9f8b1 fix search by order 2017-05-11 12:54:15 +02:00
Marion Muszynski
066f650eb3 Merge branch 'ticket-13166-ReturnProcess' into develop 2017-05-11 12:36:28 +02:00
Marion Muszynski
eb92c5a16f addition of module Return process 2017-05-11 12:36:06 +02:00
Marion Muszynski
de528d660b Merge branch 'ticket-13010-FraudUpdate' into develop 2017-05-10 10:46:31 +02:00
Marion Muszynski
d0a1ed8ed1 fix query 2017-05-10 10:45:28 +02:00
Nolwenn
419e9ce268 Merge branch 'mobile' into develop 2017-05-10 10:38:56 +02:00
Marion Muszynski
b0e8f7c900 fix for mobile 2017-05-04 16:49:50 +02:00
Marion Muszynski
c82b497c43 Merge branch 'ticket-12962-LandingPagePart2' into develop 2017-05-04 16:35:32 +02:00
Marion Muszynski
dcecac1122 fix for invite program 2017-05-04 16:35:10 +02:00
Marion Muszynski
c629217aa1 Merge branch 'ticket-13010-ModifFraud2' into develop 2017-05-04 14:04:25 +02:00
Marion Muszynski
fff250224a fix testPaxbox 2017-05-04 14:03:15 +02:00
Marion Muszynski
cc7e420bed Merge branch 'ticket-13010-ModifFraud2' into develop 2017-05-04 11:54:05 +02:00
Marion Muszynski
9d27f87e45 add test 2017-05-04 11:53:47 +02:00
Marion Muszynski
cf69aa347a Merge branch 'ticket-13010-ModifFraud2' into develop 2017-05-04 11:36:24 +02:00
Marion Muszynski
f041619d2a start of addition test in fraud module 2017-05-04 11:35:59 +02:00
Marion
3235913d20 Merge branch 'ticket-13010-ModifFraud' into develop 2017-05-03 15:47:42 +02:00
Marion
082872a04c modification when an order was in status 18 2017-05-03 15:43:20 +02:00
root
ece95c4c03 fix from prod 2017-05-02 14:39:14 +02:00
Marion Muszynski
f2a5d7ba75 fix trad 2017-05-02 11:30:22 +02:00
Marion Muszynski
a5318730ef Merge branch 'ticket-12962-LandingPage' into develop 2017-05-02 11:03:28 +02:00
Marion Muszynski
0dced8f385 redirect to authentication page for mobile navigation 2017-05-02 11:03:11 +02:00
Marion Muszynski
fa2db797b8 Merge branch 'ticket-12962-LandingPage' into develop 2017-04-28 11:05:31 +02:00
Marion Muszynski
de1c8e211e addition of new landing page on home 2017-04-28 11:05:12 +02:00
Marion Muszynski
e5bd73992e Merge branch 'ticket-13148-FixImagePosition' into develop 2017-04-27 11:06:01 +02:00
Marion Muszynski
ee0b4e9fe6 fix image positions for export vp 2017-04-27 11:05:44 +02:00
Marion Muszynski
25cffa3a74 addition of statement for preheader and title if its tomorrow news 2017-04-27 10:55:06 +02:00
Marion Muszynski
9b0bb24466 Merge branch 'ticket-13133-NewFluxEmarsys' into develop 2017-04-26 15:51:56 +02:00