407 Commits

Author SHA1 Message Date
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
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
Marion Muszynski
f1a4d79daf Merge branch 'tiket-productTemplate' into develop 2016-05-02 17:20:51 +02:00
Marion Muszynski
990ddefe16 border radius add to cart 2016-05-02 17:20:18 +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
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