22 Commits

Author SHA1 Message Date
Marion Muszynski
44829771cf fix conflict css 2016-05-13 13:33:44 +02:00
Srv Bebeboutik
1fef6beb19 modif css site et mobile 2016-05-13 11:41:40 +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
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
d3f7d66f95 fix conflict css 2016-04-21 17:44:16 +02:00
Marion Muszynski
35ee4a1c68 many update of module loyalty 2016-04-21 17:41:04 +02:00
Thibault UBUNTU
3cd9af191d Merge branch 'paypal_billing' into develop 2016-04-20 17:35:17 +02:00
Thibault UBUNTU
bbee57249a version mobile 2016-04-20 17:35:03 +02:00
Marion Muszynski
92e77117f8 Merge branch 'ticket-consumable' into develop 2016-04-15 11:46:36 +02:00
Marion Muszynski
f7f7a15339 update css site mobile 2016-04-15 11:33:00 +02:00
Marion Muszynski
d1ef6a27c2 Merge branch 'ticket-consumable' into develop 2016-04-15 11:27:16 +02:00
Marion Muszynski
7f2cf9cd16 add tpl and css for site mobile 2016-04-15 11:26:00 +02:00
Thibault UBUNTU
552b46347e v0.1 paypal billing 2016-04-06 15:52:14 +02:00
Thibault UBUNTU
688ba3bb8c Merge branch 'paypal' into develop 2016-04-04 14:58:01 +02:00
Thibault UBUNTU
0395544c05 css mobile payment 2016-04-04 14:57:51 +02:00
Alexandre Simonet
3580bdef15 Fix margin on mobile 2016-02-24 15:49:21 +01:00
Alexandre Simonet
715132c7e6 Front mobile 2016-02-24 15:33:47 +01:00
Srv Bebeboutik
340bc7c146 push site 2016-01-04 12:48:08 +01:00