Marion Muszynski
|
fd0de8d0aa
|
other fix tpl
|
2016-05-30 17:16:54 +02:00 |
|
Marion Muszynski
|
17c8bd6122
|
Merge branch 'ticket-fidelite' into develop
|
2016-05-30 17:14:05 +02:00 |
|
Marion Muszynski
|
633643d0c7
|
fix pagination
|
2016-05-30 17:13:22 +02:00 |
|
Marion Muszynski
|
85c2d3b45d
|
Merge branch 'ticket-fidelite' into develop
|
2016-05-30 16:33:46 +02:00 |
|
Marion Muszynski
|
93344e1770
|
fix shopping-cart tpl
|
2016-05-30 16:33:03 +02:00 |
|
Marion Muszynski
|
944fe22c8d
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-04 16:20:10 +02:00 |
|
Marion Muszynski
|
8e8e2793ae
|
modif arroaw slider
|
2016-05-04 16:19:18 +02:00 |
|
Marion Muszynski
|
653d0031a6
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-04 16:00:55 +02:00 |
|
Marion Muszynski
|
e85b593e35
|
modif trad
|
2016-05-04 16:00:32 +02:00 |
|
Marion Muszynski
|
de66d55c55
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-04 15:31:51 +02:00 |
|
Marion Muszynski
|
402ac44f49
|
slider blockbestsellers in product page
|
2016-05-04 15:31:28 +02:00 |
|
Marion Muszynski
|
b88d79c1cc
|
Merge branch 'ticket-fidelite' into develop
|
2016-05-03 15:58:00 +02:00 |
|
Marion Muszynski
|
c8fb4bf96b
|
petite modif
|
2016-05-03 15:57:35 +02:00 |
|
Marion Muszynski
|
13bcd0d8c6
|
Merge branch 'ticket-fidelite' into develop
|
2016-05-03 15:48:39 +02:00 |
|
Marion Muszynski
|
831cdefdf8
|
modif translation
|
2016-05-03 15:48:17 +02:00 |
|
Marion Muszynski
|
2a10c6a2fe
|
fix conflict in css
|
2016-05-03 15:40:01 +02:00 |
|
Marion Muszynski
|
63db0cc73c
|
adding in blocuserinfo
|
2016-05-03 15:38:20 +02:00 |
|
Thibault UBUNTU
|
80206ad452
|
Merge branch 'paypal_billing' into develop
|
2016-05-03 12:09:10 +02:00 |
|
Thibault UBUNTU
|
25bf39f711
|
trad es
|
2016-05-03 12:08:55 +02:00 |
|
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
|
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
|
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
|
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 |
|
Thibault UBUNTU
|
552b46347e
|
v0.1 paypal billing
|
2016-04-06 15:52:14 +02:00 |
|
Thibault GUILLAUME
|
3d0ebede08
|
test
|
2016-04-04 11:47:52 +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 |
|
Srv Bebeboutik
|
f5e8d0d1dc
|
trad
|
2016-03-07 15:18:56 +01:00 |
|
Thibault UBUNTU
|
f2b34f988a
|
modif logo footer
|
2016-03-07 11:03:22 +01:00 |
|
Srv Bebeboutik
|
20e38fa1be
|
fix trad ES box add to cart
|
2016-03-02 10:52:30 +01:00 |
|