Thibault UBUNTU
|
e1b79f1d23
|
fix conflit
|
2016-05-02 15:31:24 +02:00 |
|
Thibault UBUNTU
|
f15662e826
|
paypal suite
|
2016-05-02 15:30:12 +02:00 |
|
Marion Muszynski
|
73ceb55254
|
fix conflict site_mobile css
|
2016-05-02 15:23:47 +02:00 |
|
Marion Muszynski
|
23ede34fec
|
suite modif tpl product
|
2016-05-02 15:19:54 +02:00 |
|
Marion Muszynski
|
75bf1e0ec4
|
Merge branch 'tiket-productTemplate' into develop
|
2016-04-29 16:15:04 +02:00 |
|
Marion Muszynski
|
2033c1e937
|
update flag position
|
2016-04-29 16:14:41 +02:00 |
|
Marion Muszynski
|
5da6bd1c3f
|
Merge branch 'tiket-productTemplate' into develop
|
2016-04-29 16:04:45 +02:00 |
|
Marion Muszynski
|
f4597e397e
|
modif flag expe in product tpl
|
2016-04-29 16:04:17 +02:00 |
|
Marion Muszynski
|
fd7e18fc32
|
Merge branch 'tiket-productTemplate' into develop
|
2016-04-27 16:35:32 +02:00 |
|
Marion Muszynski
|
9f104f2c8f
|
modif tpl product
|
2016-04-27 16:35:02 +02:00 |
|
Marion Muszynski
|
baee8d8c10
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-27 16:25:03 +02:00 |
|
Marion Muszynski
|
73a43c2042
|
modif tpl product
|
2016-04-27 16:24:35 +02:00 |
|
Marion Muszynski
|
95b51d3389
|
fix conflict css
|
2016-04-27 16:13:54 +02:00 |
|
Marion Muszynski
|
2a160422d9
|
adding desc more for product
|
2016-04-27 16:11:19 +02:00 |
|
Marion Muszynski
|
b3e4aa78ab
|
Merge branch 'tiket-productTemplate' into develop
|
2016-04-26 17:06:40 +02:00 |
|
Marion Muszynski
|
20beed5ed7
|
modif css
|
2016-04-26 17:06:16 +02:00 |
|
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
|
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 |
|