Marion Muszynski
|
3a5edf328a
|
Merge branch 'tiket-productTemplate' into develop
|
2016-04-26 17:02:11 +02:00 |
|
Marion Muszynski
|
2217bf5414
|
modif tpl
|
2016-04-26 17:01:44 +02:00 |
|
Marion Muszynski
|
b294276498
|
Merge branch 'tiket-productTemplate' into develop
|
2016-04-26 16:52:26 +02:00 |
|
Marion Muszynski
|
e85ce5fb93
|
modif next for thumb
|
2016-04-26 16:52:04 +02:00 |
|
Marion Muszynski
|
3aa40ff214
|
Merge branch 'tiket-productTemplate' into develop
|
2016-04-26 16:43:52 +02:00 |
|
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
|
423b9fbcc0
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-25 16:05:33 +02:00 |
|
Marion Muszynski
|
c4052dc0f0
|
modif css mobile
|
2016-04-25 16:04:51 +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
|
6827513a88
|
Merge branch 'paypal_billing' into develop
|
2016-04-20 17:39:02 +02:00 |
|
Thibault UBUNTU
|
fa60d253e8
|
box paypal
|
2016-04-20 17:38:57 +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
|
f2e0e80149
|
Merge branch 'ticket-landingpage' into develop
|
2016-04-20 12:35:50 +02:00 |
|
Marion Muszynski
|
4c4c069588
|
modif width button
|
2016-04-20 12:35:20 +02:00 |
|
Marion Muszynski
|
f288f1ce8d
|
Merge branch 'ticket-landingpage' into develop
|
2016-04-18 15:22:50 +02:00 |
|
Marion Muszynski
|
d7b7e7abc6
|
modif connect button in landing page
|
2016-04-18 15:22:00 +02:00 |
|
Marion Muszynski
|
92e77117f8
|
Merge branch 'ticket-consumable' into develop
|
2016-04-15 11:46:36 +02:00 |
|
Marion Muszynski
|
d0a702380f
|
update css
|
2016-04-15 11:43:42 +02:00 |
|
Marion Muszynski
|
0073cb8dde
|
fix css
|
2016-04-15 11:37:01 +02:00 |
|
Marion Muszynski
|
f7f7a15339
|
update css site mobile
|
2016-04-15 11:33:00 +02:00 |
|
Marion Muszynski
|
d1ef6a27c2
|
Merge branch 'ticket-consumable' into develop
|
2016-04-15 11:27:16 +02:00 |
|
Marion Muszynski
|
7f2cf9cd16
|
add tpl and css for site mobile
|
2016-04-15 11:26:00 +02:00 |
|
Marion Muszynski
|
89aa68b911
|
Merge branch 'ticket-landingpage' into develop
|
2016-04-13 13:06:52 +02:00 |
|
Marion Muszynski
|
0a0859d9dd
|
add hook for site_mobile
|
2016-04-13 13:06:28 +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 |
|