54 Commits

Author SHA1 Message Date
Marion Muszynski
0221ccb2e7 Merge branch 'ticket-10527' into develop 2016-08-31 15:17:41 +02:00
Marion Muszynski
144733299c up reassurance sentence at first place 2016-08-31 15:17:21 +02:00
Marion Muszynski
742a8d1ca9 fix conflicts 2016-08-31 13:36:10 +02:00
Marion Muszynski
2dd1baef49 adding reassurance sentences for es 2016-08-31 13:32:59 +02:00
Marion Muszynski
bb5ff6ba97 fix conflicts 2016-08-31 11:04:16 +02:00
Marion Muszynski
c164e03c24 fix conflict 2016-08-31 10:37:12 +02:00
Marion Muszynski
8db5762b5b modif css mobile 2016-08-31 10:35:33 +02:00
Marion Muszynski
e02097858b fix css conflicts 2016-08-23 12:31:28 +02:00
Rodney Figaro
b95db0bb8c change css of the size info popup for mobile version 2016-08-23 12:06:39 +02:00
Rodney Figaro
2a2949882d display informations on sizes in product details 2016-08-23 10:33:48 +02:00
Marion Muszynski
155dd48cad fix conflict 2016-07-01 11:02:09 +02:00
Marion Muszynski
e695afb543 Merge branch 'ticket-simplemulti_front' into develop 2016-06-30 10:48:06 +02:00
Marion Muszynski
f99cacd293 small update for mobile site 2016-06-30 10:47:46 +02:00
Marion Muszynski
7fa45bf40f Merge branch 'ticket-simplemulti_front' into develop 2016-06-29 09:59:37 +02:00
Marion Muszynski
20896d3bbf adding popup error for mobile 2016-06-29 09:59:03 +02:00
Marion Muszynski
f3fdc49173 fix conflict 2016-06-22 16:11:15 +02:00
Marion Muszynski
77b9c22014 fix conflicts 2016-06-22 15:03:36 +02:00
Dylan Travers
1e674c4adf Add 'X item(s) in stock' from ticket n°9890 2016-06-14 10:40:57 +02:00
Marion Muszynski
cf10bd3be0 fix conflicts 2016-06-08 17:15:28 +02:00
Marion Muszynski
30b39b5776 fix conflicts 2016-06-08 10:53:07 +02:00
Marion Muszynski
5a7e53a116 fix conflicts 2016-06-07 14:45:26 +02:00
Srv Bebeboutik
7025bce024 add phrase frais de port popup 2016-06-07 12:52:15 +02:00
Marion Muszynski
7065edffe4 fix conflict 2016-06-06 17:42:00 +02:00
Marion Muszynski
79c1381705 Merge branch 'ticket-fidelite' into develop 2016-06-06 15:53:52 +02:00
Marion Muszynski
cd3761a104 modif for site_mobile 2016-06-06 15:53:23 +02:00
Marion Muszynski
72545630a3 fix conflicts 2016-06-06 11:32:25 +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
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
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
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