508 Commits

Author SHA1 Message Date
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
Marion Muszynski
b7f247729f modif tpl carrier et css 2016-05-17 15:56:27 +02:00
Marion Muszynski
348be7d6f4 Merge branch 'ticket-modifCarriers' into develop 2016-05-13 15:41:23 +02:00
Marion Muszynski
70d2b78a74 modif site_mobile 2016-05-13 14:47:22 +02:00
Marion Muszynski
44829771cf fix conflict css 2016-05-13 13:33:44 +02:00
Marion Muszynski
7e7feb5a52 ajust css and opti restrict addresses 2016-05-13 13:31:50 +02:00
Srv Bebeboutik
1fef6beb19 modif css site et mobile 2016-05-13 11:41:40 +02:00
Marion Muszynski
56683972c7 Merge branch 'tiket-productTemplate' into develop 2016-05-10 16:14:11 +02:00
Marion Muszynski
183ad376d0 modif for delay flag 2016-05-10 16:13:48 +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
d54abebb29 Merge branch 'tiket-productTemplate' into develop 2016-05-04 15:37:03 +02:00
Marion Muszynski
231dbe444e modif css 2016-05-04 15:36:41 +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
Marion Muszynski
b7f2c64d64 Merge branch 'tiket-productTemplate' into develop 2016-05-03 15:04:27 +02:00
Marion Muszynski
60cb1752c7 modif tpl product mobile 2016-05-03 15:03:54 +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
Marion Muszynski
e69dd75074 Merge branch 'tiket-productTemplate' into develop 2016-05-02 17:49:43 +02:00
Marion Muszynski
77f391e66d Merge branch 'ticket-fidelite' into develop 2016-05-02 17:48:42 +02:00
Marion Muszynski
bf39d6aa82 modif css 2016-05-02 17:48:16 +02:00
Marion Muszynski
388a6bfc10 modif css 2016-05-02 17:46:53 +02:00