407 Commits

Author SHA1 Message Date
Marion Muszynski
82a536aa5f modif tpl 2016-04-26 16:43:28 +02:00
Marion Muszynski
02fe6acca8 Merge branch 'tiket-productTemplate' into develop 2016-04-26 16:39:22 +02:00
Marion Muszynski
5b40878629 modif tpl 2016-04-26 16:39:06 +02:00
Marion Muszynski
21f418dd84 fix confict css 2016-04-26 16:22:26 +02:00
Marion Muszynski
cbf6deeb91 begin new product tpl 2016-04-26 16:19:40 +02:00
Marion Muszynski
6926224b43 Merge branch 'ticket-fidelite' into develop 2016-04-25 12:45:37 +02:00
Marion Muszynski
be4026ba1a modif tpl 2016-04-25 12:45:13 +02:00
Marion Muszynski
bd74ed03d7 Merge branch 'ticket-fidelite' into develop 2016-04-22 16:31:11 +02:00
Marion Muszynski
cd742921f3 update tpl 2016-04-22 16:30:18 +02:00
Marion Muszynski
d3f7d66f95 fix conflict css 2016-04-21 17:44:16 +02:00
Marion Muszynski
35ee4a1c68 many update of module loyalty 2016-04-21 17:41:04 +02:00
Marion Muszynski
02bff329ca Merge branch 'ticket-fidelite' into develop 2016-04-21 12:01:36 +02:00
Marion Muszynski
15f3b6fa20 modif tpl 2016-04-21 12:01:10 +02:00
Marion Muszynski
042d42d578 Merge branch 'ticket-fidelite' into develop 2016-04-21 11:32:06 +02:00
Marion Muszynski
c8befd1ede total modification of loyalty module 2016-04-21 11:14:33 +02:00
Thibault UBUNTU
3cd9af191d Merge branch 'paypal_billing' into develop 2016-04-20 17:35:17 +02:00
Thibault UBUNTU
bbee57249a version mobile 2016-04-20 17:35:03 +02:00
Marion Muszynski
21f1ada2d1 Merge branch 'ticket-landingpage' 2016-04-20 15:35:16 +02:00
Marion Muszynski
fd5bccadd7 begin loyalty 2016-04-20 15:33:56 +02:00
Thibault UBUNTU
c37df06d47 add reassurance text 2016-04-20 15:32:12 +02:00
Thibault UBUNTU
6512b4aaaa Merge branch 'develop' of gitlab.antadis.fr:dev-antadis/bebeboutik into develop 2016-04-20 14:20:40 +02:00
Thibault UBUNTU
848dbdedc0 load payment paypal 2016-04-20 14:20:07 +02:00
Marion Muszynski
92e77117f8 Merge branch 'ticket-consumable' into develop 2016-04-15 11:46:36 +02:00
Marion Muszynski
0073cb8dde fix css 2016-04-15 11:37:01 +02:00
Marion Muszynski
0b0ebcb26f fix conflict consommables 2016-04-12 15:17:45 +02:00
Marion Muszynski
1a0cf55865 Merge branch 'ticket-landingpage' into develop 2016-04-08 15:32:30 +02:00
Marion Muszynski
1d26459616 update landing page for connect button 2016-04-08 15:31:40 +02:00
Marion Muszynski
f9962ab6d3 fix conflict adminProduct 2016-04-08 10:33:14 +02:00
Thibault UBUNTU
552b46347e v0.1 paypal billing 2016-04-06 15:52:14 +02:00
Marion Muszynski
4309307488 modif script put in header.tpl 2016-04-05 16:18:52 +02:00
Marion Muszynski
f986fa77a6 ajout script crazyegg 2016-04-04 17:30:52 +02:00
Thibault UBUNTU
8471702ff7 fix 2016-04-04 13:25:38 +02:00
Thibault UBUNTU
39f9ff27e5 skin page payment 2016-04-04 13:24:07 +02:00
Thibault GUILLAUME
5beaf8e77e fix conflict 2016-04-04 11:49:45 +02:00
Thibault GUILLAUME
3d0ebede08 test 2016-04-04 11:47:52 +02:00
Srv Bebeboutik
85c9a39043 https on facebook 2016-04-04 11:44:49 +02:00
Srv Bebeboutik
56f1489fbc petite trad 2016-03-31 12:08:39 +02:00
Srv Bebeboutik
c3c53223ca remove ie6 info 2016-03-31 12:06:40 +02:00
Srv Bebeboutik
bcdb91f1e3 prepare ssl 2016-03-31 12:06:08 +02:00
Marion Muszynski
086f3f5906 add define 2016-03-16 17:56:03 +01:00
Marion Muszynski
de06f70738 check consommables 2016-03-16 15:24:12 +01:00
Thibault UBUNTU
4a6ce8b8c1 add delete delivery delay on shopping cart if no product 2016-03-09 16:44:00 +01:00
Thibault UBUNTU
66467587a9 add limit economy test 2016-03-07 16:02:27 +01:00
Srv Bebeboutik
f5e8d0d1dc trad 2016-03-07 15:18:56 +01:00
Thibault UBUNTU
04052b1ce7 addreassurance text on es version 2016-03-07 13:01:56 +01:00
Thibault UBUNTU
f2b34f988a modif logo footer 2016-03-07 11:03:22 +01:00
Thibault UBUNTU
2d660b2c2a change img transporteur es 2016-03-02 11:14:09 +01:00
Srv Bebeboutik
20e38fa1be fix trad ES box add to cart 2016-03-02 10:52:30 +01:00
Srv Bebeboutik
0918b1e26d push prod 2016-02-24 16:23:27 +01:00
Marion Muszynski
58084aa3c7 adding module ant_support et ant_support_form 2016-02-19 15:30:29 +01:00