288 Commits

Author SHA1 Message Date
Marion Muszynski
99b35ed57a adding delivery description field for product 2016-06-03 12:07:12 +02:00
Marion Muszynski
15871cea67 Merge branch 'tiket-productTemplate' into develop 2016-06-01 14:40:11 +02:00
Marion Muszynski
289a55b5e4 small update 2016-06-01 14:39:30 +02:00
Marion Muszynski
349aa65a7d Merge branch 'tiket-productTemplate' into develop 2016-06-01 12:57:39 +02:00
Marion Muszynski
e04cd105b8 modif code hex 2016-06-01 12:57:10 +02:00
Marion Muszynski
d0217bf4f6 Merge branch 'tiket-productTemplate' into develop 2016-06-01 12:52:13 +02:00
Marion Muszynski
700c5dc9e0 css modif 2016-06-01 12:51:53 +02:00
Marion Muszynski
fd42b0425b Merge branch 'tiket-productTemplate' into develop 2016-06-01 12:48:12 +02:00
Marion Muszynski
71ba5e170a small update 2016-06-01 12:47:48 +02:00
Marion Muszynski
83ac3dbe3f fix conflcit 2016-06-01 12:45:33 +02:00
Marion Muszynski
d59e49e3ba update scrollbar color and more 2016-06-01 12:43:12 +02:00
Marion Muszynski
5bf7b1f7e1 Merge branch 'ticket-dropshipping' into develop 2016-06-01 11:24:01 +02:00
Marion Muszynski
3e0ad8592d update link 2016-06-01 11:23:37 +02:00
Marion Muszynski
42c7bf13b4 Merge branch 'ticket-dropshipping' into develop 2016-06-01 10:58:05 +02:00
Marion Muszynski
96ca86fe85 modif error message 2016-06-01 10:57:31 +02:00
Marion Muszynski
79964293be Merge branch 'tiket-productTemplate' into develop 2016-05-31 16:34:15 +02:00
Marion Muszynski
ed9658e97e comment facebook like 2016-05-31 16:33:28 +02:00
Marion Muszynski
aeb00544fb Merge branch 'tiket-productTemplate' into develop 2016-05-30 18:07:07 +02:00
Marion Muszynski
cd56c49c48 modif css 2016-05-30 18:06:19 +02:00
Marion Muszynski
6c1d54467b Merge branch 'ticket-fidelite' into develop 2016-05-30 17:52:52 +02:00
Marion Muszynski
725251f138 fix css 2016-05-30 17:52:18 +02:00
Marion Muszynski
df3661299e Merge branch 'ticket-fidelite' into develop 2016-05-30 17:46:30 +02:00
Marion Muszynski
ed698c66f8 modif css 2016-05-30 17:45:51 +02:00
Marion Muszynski
66171d1e76 Merge branch 'ticket-fidelite' into develop 2016-05-30 17:42:05 +02:00
Marion Muszynski
0cf8ac97a9 modif css 2016-05-30 17:41:17 +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
2b14f9bd61 Merge branch 'ticket-dropshipping' into develop 2016-05-30 15:42:50 +02:00
Marion Muszynski
d63a2d7d5a addind field to config if delivery of sale is enabled only in fr 2016-05-30 15:42:20 +02:00
Marion Muszynski
c9265f1116 Merge branch 'tiket-productTemplate' into develop 2016-05-30 12:07:47 +02:00
Marion Muszynski
a4ad9d98b0 modif tpl product css 2016-05-30 12:07:24 +02:00
Marion Muszynski
1af459d215 Merge branch 'tiket-productTemplate' into develop 2016-05-26 14:36:00 +02:00
Marion Muszynski
122cea0bc5 modif img product 2016-05-26 14:35:35 +02:00
Marion Muszynski
bee4986a9f Merge branch 'tiket-productTemplate' into develop 2016-05-20 15:02:56 +02:00
Marion Muszynski
f479a0f9a7 modif css 2016-05-20 15:02:22 +02:00
Marion Muszynski
da375df311 Merge branch 'tiket-productTemplate' into develop 2016-05-20 12:38:50 +02:00
Marion Muszynski
a356edf0df modif picto 2016-05-20 12:38:25 +02:00
Marion Muszynski
f59fe988c6 fix conflict 2016-05-20 10:50:27 +02:00
Marion Muszynski
b68de72f86 add postcode autocomplete for mobile 2016-05-20 10:48:35 +02:00
Marion Muszynski
64cfa67dbf clean js console 2016-05-19 14:47:38 +02:00
Marion Muszynski
5c6f243d6b fix conflict 2016-05-19 13:17:54 +02:00
Marion Muszynski
eb441d8edf adding autocomplete postcode 2016-05-19 13:13:47 +02:00
Marion Muszynski
3db1f64164 Merge branch 'ticket-modifAddress' into develop 2016-05-17 17:43:49 +02:00
Marion Muszynski
2030584c84 modif img site mobile 2016-05-17 16:36:28 +02:00
Marion Muszynski
9eda48a6b4 modif img payment_2 2016-05-17 16:33:20 +02:00
Marion Muszynski
1cb1c7398e fix conflict css 2016-05-17 15:57:59 +02:00