Commit Graph

440 Commits

Author SHA1 Message Date
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
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
7e778b24b6 Merge branch 'paypal_billing' into develop 2016-05-02 16:01:44 +02:00
Thibault UBUNTU
23c26bf0ee back to account mobile 2016-05-02 16:01:29 +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
edfbde5fd3 Merge branch 'ticket-newExtract' into develop 2016-04-27 18:05:37 +02:00
Marion Muszynski
397a73d037 modif product price for DEB exp 2016-04-27 18:04:42 +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
73fb48d7b4 Merge branch 'ticket-newExtract' into develop 2016-04-27 12:08:45 +02:00
Marion Muszynski
9e2c4c5c39 adding origin product to DEB exp 2016-04-27 12:08:22 +02:00
Marion Muszynski
f19e86331a Merge branch 'ticket-newExtract' into develop 2016-04-27 11:12:00 +02:00
Marion Muszynski
5f96303fe9 modif for multi generation of csv in same time 2016-04-27 11:11:23 +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
Marion Muszynski
82a536aa5f modif tpl 2016-04-26 16:43:28 +02:00
Marion Muszynski
02fe6acca8 Merge branch 'tiket-productTemplate' into develop 2016-04-26 16:39:22 +02:00
Marion Muszynski
5b40878629 modif tpl 2016-04-26 16:39:06 +02:00
Marion Muszynski
21f418dd84 fix confict css 2016-04-26 16:22:26 +02:00
Marion Muszynski
cbf6deeb91 begin new product tpl 2016-04-26 16:19:40 +02:00
Marion Muszynski
f72b207fc0 Merge branch 'ticket-newExtract' into develop 2016-04-25 17:17:05 +02:00
Marion Muszynski
54bbfd5248 modif extract 2016-04-25 17:16:29 +02:00
Marion Muszynski
dde198080d modif extract custom 2016-04-25 16:50:51 +02:00
Marion Muszynski
423b9fbcc0 Merge branch 'ticket-fidelite' into develop 2016-04-25 16:05:33 +02:00
Marion Muszynski
c4052dc0f0 modif css mobile 2016-04-25 16:04:51 +02:00
Marion Muszynski
6926224b43 Merge branch 'ticket-fidelite' into develop 2016-04-25 12:45:37 +02:00