Marion Muszynski
|
d8307d12ef
|
Merge branch 'ticket-8039' into develop
|
2016-06-22 17:51:17 +02:00 |
|
Marion Muszynski
|
d2d845a4d8
|
small fix
|
2016-06-22 17:50:52 +02:00 |
|
Marion Muszynski
|
22a8b5cac1
|
Merge branch 'ticket-8039' into develop
|
2016-06-22 17:23:56 +02:00 |
|
Marion Muszynski
|
7043f4b24a
|
other fix
|
2016-06-22 17:23:34 +02:00 |
|
Marion Muszynski
|
224267f45c
|
Merge branch 'ticket-8039' into develop
|
2016-06-22 17:08:37 +02:00 |
|
Marion Muszynski
|
a6c46f9077
|
petit fix before prod
|
2016-06-22 17:08:09 +02:00 |
|
Marion Muszynski
|
62009ba633
|
Merge branch 'ticket-8039' into develop
|
2016-06-10 16:50:05 +02:00 |
|
Marion Muszynski
|
7af6d9ccd7
|
adding bg for sale
|
2016-06-10 16:49:43 +02:00 |
|
Marion Muszynski
|
ba706ec6c9
|
Merge branch 'ticket-fidelite'
|
2016-06-08 16:33:40 +02:00 |
|
Marion Muszynski
|
1b2020f041
|
Merge branch 'ticket-fidelite' into develop
|
2016-06-08 16:28:25 +02:00 |
|
Marion Muszynski
|
d47310bc0a
|
redirect for es version
|
2016-06-08 16:27:56 +02:00 |
|
Marion Muszynski
|
ab21f10643
|
Merge branch 'ticket-fidelite'
|
2016-06-08 12:53:58 +02:00 |
|
Marion Muszynski
|
dc85f8eca6
|
modif trad
|
2016-06-08 12:53:38 +02:00 |
|
Marion Muszynski
|
5c8e35adf2
|
Merge branch 'ticket-fidelite'
|
2016-06-08 12:16:37 +02:00 |
|
Marion Muszynski
|
8fc47d1d6e
|
Merge branch 'ticket-fidelite' into develop
|
2016-06-08 11:44:35 +02:00 |
|
Marion Muszynski
|
83c4acc83d
|
opti request
|
2016-06-08 11:44:13 +02:00 |
|
Marion Muszynski
|
30b39b5776
|
fix conflicts
|
2016-06-08 10:53:07 +02:00 |
|
Marion Muszynski
|
4148656a60
|
Merge branch 'ticket-8041' into develop
|
2016-06-07 17:43:19 +02:00 |
|
Srv Bebeboutik
|
f96c85f584
|
trad
|
2016-06-07 16:01:57 +02:00 |
|
Marion Muszynski
|
5a7e53a116
|
fix conflicts
|
2016-06-07 14:45:26 +02:00 |
|
Srv Bebeboutik
|
7025bce024
|
add phrase frais de port popup
|
2016-06-07 12:52:15 +02:00 |
|
Dylan Travers
|
d099294e5f
|
Fix error alert message of ticket 9198
|
2016-06-07 10:20:29 +02:00 |
|
Dylan Travers
|
9b8795607a
|
Ajout de la phrase du ticket N°9891
|
2016-06-06 18:10:47 +02:00 |
|
Dylan Travers
|
54b10d9432
|
Ajout de la phrase demandée dans le ticket N°9891
|
2016-06-06 18:02:02 +02:00 |
|
Marion Muszynski
|
72545630a3
|
fix conflicts
|
2016-06-06 11:32:25 +02:00 |
|
Marion Muszynski
|
5dda7b4685
|
Merge branch 'ticket-fidelite' into develop
|
2016-05-30 17:17:26 +02:00 |
|
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 |
|