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
|
c45e018298
|
Merge branch 'ticket_9890' into develop
|
2016-08-26 17:08:53 +02:00 |
|
Marion Muszynski
|
bab94ab68b
|
fix and modif css
|
2016-08-26 17:08:28 +02:00 |
|
Marion Muszynski
|
cf8f32d6c1
|
Merge branch 'ticket-9895' into develop
|
2016-08-25 12:48:36 +02:00 |
|
Marion Muszynski
|
63ee2fb3c9
|
fix tpl product add to cart
|
2016-08-23 18:07:24 +02:00 |
|
Marion Muszynski
|
343fc553aa
|
modif for prod
|
2016-08-23 15:21:43 +02:00 |
|
Marion Muszynski
|
b3e04efabe
|
Merge branch 'evo-10581' into develop
|
2016-08-23 12:32:54 +02:00 |
|
Marion Muszynski
|
e02097858b
|
fix css conflicts
|
2016-08-23 12:31:28 +02:00 |
|
Rodney Figaro
|
b335e6adf1
|
fix original text in product info size in french rather than in spanish
|
2016-08-23 12:17:56 +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
|
2a82114fa9
|
fix conflict
|
2016-08-22 17:10:12 +02:00 |
|
root
|
880d16d5b0
|
updateprod
|
2016-08-18 15:56:46 +02:00 |
|
Marion Muszynski
|
a2e67137bf
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-07-18 11:45:49 +02:00 |
|
Marion Muszynski
|
fb51c877c4
|
suite save paybox info
|
2016-07-18 11:45:18 +02:00 |
|
Dylan Travers
|
c2d4fb13c9
|
Show only if product.quantity > 0
|
2016-07-08 15:37:30 +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
|
e7f0c678de
|
fix conflict
|
2016-06-29 15:53:34 +02:00 |
|
Marion Muszynski
|
760bd50c06
|
adding sentence according delivery delay
|
2016-06-29 15:52:03 +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 |
|
Dylan Travers
|
c3f3e05427
|
Change pink color and modify comportement (Use All_quantities and not product_quantity
|
2016-06-27 12:25:22 +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 |
|
Marion Muszynski
|
53af527187
|
Merge branch 'tiket-productTemplate' into develop
|
2016-06-22 12:53:47 +02:00 |
|
Marion Muszynski
|
f5cb833c6e
|
put description more over description short
|
2016-06-22 12:53:17 +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
|
4148656a60
|
Merge branch 'ticket-8041' into develop
|
2016-06-07 17:43:19 +02:00 |
|
Srv Bebeboutik
|
f96c85f584
|
trad
|
2016-06-07 16:01:57 +02:00 |
|
Marion Muszynski
|
1c2c54f808
|
fix conflict
|
2016-06-07 14:51:10 +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 |
|
Dylan Travers
|
d099294e5f
|
Fix error alert message of ticket 9198
|
2016-06-07 10:20:29 +02:00 |
|
Dylan Travers
|
57584df3c0
|
Fix bug sentence. Ticket N° 9891
|
2016-06-07 09:51:09 +02:00 |
|
Dylan Travers
|
9b8795607a
|
Ajout de la phrase du ticket N°9891
|
2016-06-06 18:10:47 +02:00 |
|
Dylan Travers
|
54b10d9432
|
Ajout de la phrase demandée dans le ticket N°9891
|
2016-06-06 18:02:02 +02:00 |
|
Marion Muszynski
|
7065edffe4
|
fix conflict
|
2016-06-06 17:42:00 +02:00 |
|
Marion Muszynski
|
a966ed080e
|
Merge branch 'ticket-fidelite' into develop
|
2016-06-06 15:56:56 +02:00 |
|
Marion Muszynski
|
768c3dea8b
|
petit fix
|
2016-06-06 15:56:25 +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 |
|
Srv Bebeboutik
|
3ec698aa01
|
Merge branch 'master' of gitlab.antadis.fr:dev-antadis/bebeboutik
|
2016-06-06 12:03:14 +02:00 |
|
Srv Bebeboutik
|
1fab58c2d6
|
trad fr
|
2016-06-06 11:36:03 +02:00 |
|
Marion Muszynski
|
72545630a3
|
fix conflicts
|
2016-06-06 11:32:25 +02:00 |
|
Marion Muszynski
|
76f698ee8f
|
Merge branch 'tiket-productTemplate' into develop
|
2016-06-03 12:07:42 +02:00 |
|
Marion Muszynski
|
99b35ed57a
|
adding delivery description field for product
|
2016-06-03 12:07:12 +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
|
5bf7b1f7e1
|
Merge branch 'ticket-dropshipping' into develop
|
2016-06-01 11:24:01 +02:00 |
|
Marion Muszynski
|
3e0ad8592d
|
update link
|
2016-06-01 11:23:37 +02:00 |
|
Marion Muszynski
|
42c7bf13b4
|
Merge branch 'ticket-dropshipping' into develop
|
2016-06-01 10:58:05 +02:00 |
|
Marion Muszynski
|
96ca86fe85
|
modif error message
|
2016-06-01 10:57:31 +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
|
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
|
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 |
|
Srv Bebeboutik
|
1fef6beb19
|
modif css site et mobile
|
2016-05-13 11:41:40 +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 |
|
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
|
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 |
|
Marion Muszynski
|
be4026ba1a
|
modif tpl
|
2016-04-25 12:45:13 +02:00 |
|
Marion Muszynski
|
bd74ed03d7
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-22 16:31:11 +02:00 |
|
Marion Muszynski
|
cd742921f3
|
update tpl
|
2016-04-22 16:30:18 +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
|
6827513a88
|
Merge branch 'paypal_billing' into develop
|
2016-04-20 17:39:02 +02:00 |
|
Thibault UBUNTU
|
fa60d253e8
|
box paypal
|
2016-04-20 17:38:57 +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
|
21f1ada2d1
|
Merge branch 'ticket-landingpage'
|
2016-04-20 15:35:16 +02:00 |
|
Marion Muszynski
|
f2e0e80149
|
Merge branch 'ticket-landingpage' into develop
|
2016-04-20 12:35:50 +02:00 |
|
Marion Muszynski
|
4c4c069588
|
modif width button
|
2016-04-20 12:35:20 +02:00 |
|
Marion Muszynski
|
f288f1ce8d
|
Merge branch 'ticket-landingpage' into develop
|
2016-04-18 15:22:50 +02:00 |
|
Marion Muszynski
|
d7b7e7abc6
|
modif connect button in landing page
|
2016-04-18 15:22:00 +02:00 |
|
Marion Muszynski
|
92e77117f8
|
Merge branch 'ticket-consumable' into develop
|
2016-04-15 11:46:36 +02:00 |
|
Marion Muszynski
|
d0a702380f
|
update css
|
2016-04-15 11:43:42 +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 |
|
Marion Muszynski
|
89aa68b911
|
Merge branch 'ticket-landingpage' into develop
|
2016-04-13 13:06:52 +02:00 |
|