Commit Graph

728 Commits

Author SHA1 Message Date
Michael RICOIS
77ae796785 Merge branch 'ticket-10393-guide-achat' into develop 2017-11-21 16:17:28 +01:00
Michael RICOIS
097ecc3937 Add mobile view for purchase guide 2017-11-21 09:28:02 +01:00
Michael RICOIS
8b0a6077da Style 2017-11-20 17:35:43 +01:00
Michael RICOIS
ea761282f0 Style 2017-11-16 16:50:01 +01:00
Marion Muszynski
d2acbed313 Merge branch 'ticket-14456-BugBaliseEd' into develop 2017-11-15 12:41:22 +01:00
Michael RICOIS
b516aa748b Test Front 2017-11-15 11:03:34 +01:00
root
43a085d4ec push from prod 2017-11-15 10:34:51 +01:00
Marion Muszynski
d6d2cc5298 Merge branch 'ticket-14735-NewExpe' into develop 2017-11-15 10:29:15 +01:00
Marion Muszynski
05e4f94e48 add flag in product tpl 2017-11-15 10:29:07 +01:00
Marion Muszynski
a9fa8826a5 Merge branch 'ticket-14735-NewExpe' into develop 2017-11-15 10:23:37 +01:00
Marion Muszynski
4d1435ade8 add new delay flag 2017-11-14 17:29:16 +01:00
Marion Muszynski
fe0c0ad177 Merge branch 'ticket-14735-NewExpe' into develop 2017-11-14 17:09:37 +01:00
Marion Muszynski
83171ab6c2 add a new delay 2017-11-14 17:09:17 +01:00
Michael RICOIS
006edad609 Breadcrumb 2017-11-14 11:25:17 +01:00
Michael RICOIS
2979dc56a6 Change privatesales menu 2017-11-10 16:01:49 +01:00
Marion Muszynski
5a83607b98 Merge branch 'inte-white-fix' into develop 2017-11-06 12:15:01 +01:00
Marion Muszynski
d2614d471f fix 2017-11-06 12:14:54 +01:00
Marion Muszynski
0cf41a41b1 Merge branch 'inte-white-fix' into develop 2017-11-06 12:07:27 +01:00
Marion Muszynski
6036bfd280 fix css carrier table 2017-11-06 12:06:14 +01:00
Marion Muszynski
a53ea90104 fix conflicts 2017-11-06 11:58:06 +01:00
Marion Muszynski
f31e4d5fd6 fix style order conf detail tpl 2017-11-06 11:45:20 +01:00
root
cd73ae71a8 change bg and mtn img 2017-11-03 16:22:44 +01:00
Marion Muszynski
1f4ce3dc25 Merge branch 'ticket-White_2' into develop 2017-10-31 14:42:37 +01:00
Marion Muszynski
1c4575214d fix css 2017-10-31 14:42:23 +01:00
Marion Muszynski
ef54c025ad Merge branch 'ticket-White_2' into develop 2017-10-31 13:11:14 +01:00
Marion Muszynski
c9e623083b css 2017-10-31 13:10:59 +01:00
Marion Muszynski
6f3b5615dc Merge branch 'ticket-12868-WhiteBG' 2017-10-30 11:35:14 +01:00
Marion Muszynski
9562aa2e68 Merge branch 'ticket-12868-WhiteBG' into develop 2017-10-25 14:55:46 +02:00
Marion Muszynski
6b297128bb change payment img 2017-10-25 14:55:29 +02:00
Marion Muszynski
2ea53f44ab Merge branch 'fix-namePromoBanner' into develop 2017-10-24 18:30:31 +02:00
Marion Muszynski
61a00eafbd fix in tpl 2017-10-24 18:30:20 +02:00
Marion Muszynski
df52811ada Merge branch 'ticket-14526-LoyaltyPaymentError' into develop 2017-10-19 17:13:41 +02:00
Marion Muszynski
e6452dbab7 Merge branch 'ticket-12868-WhiteBG' into develop 2017-10-19 16:35:25 +02:00
Marion Muszynski
151c9a59c2 continuing of inte 2017-10-19 16:35:09 +02:00
root
9c97f5ff94 fix and translation from prod 2017-10-18 12:10:35 +02:00
Marion Muszynski
f36495dcfb Merge branch 'ticket-14231-inteMobile' into develop 2017-10-13 11:17:51 +02:00
Marion Muszynski
9823ff1d0b inte order detail mobile 2017-10-13 11:17:27 +02:00
Marion Muszynski
f33d4403a5 fix conflict 2017-10-12 13:59:34 +02:00
Marion Muszynski
13843bc270 integration for white bg 2017-10-12 13:58:41 +02:00
Marion Muszynski
abd2344c77 fix conflict 2017-10-12 09:58:55 +02:00
Marion Muszynski
8d0392bd44 fix pink color 2017-10-12 09:57:46 +02:00
Marion Muszynski
d5bbf47f10 fix conflicts 2017-09-29 15:51:41 +02:00
Marion Muszynski
c7a482e1d0 minify css and js scripts 2017-09-29 15:50:02 +02:00
Marion Muszynski
7e9926a502 Merge branch 'ticket-14197-ConstantSale' into develop 2017-09-13 10:43:41 +02:00
root
91e4537e41 fix and trad from prod 2017-09-13 10:28:19 +02:00
Marion Muszynski
51d0a8d3a4 Merge branch 'ticket-12868-WhiteBG' into develop 2017-09-12 12:08:39 +02:00
Marion Muszynski
965eab38e3 coloring background in white 2017-09-12 12:08:18 +02:00
Marion Muszynski
379bec4ab4 Merge branch 'task-imgForMobile' into develop 2017-09-01 12:00:07 +02:00
root
61ed06dc22 Revert "Revert "fix from prod""
This reverts commit 38a13c74d6.
2017-09-01 11:22:11 +02:00
root
38a13c74d6 Revert "fix from prod"
This reverts commit cd44650b28.
2017-09-01 11:16:02 +02:00