Marion Muszynski
|
0ee8479f3c
|
remove grey border on shipping menu of product tpl
|
2016-07-06 11:18:06 +02:00 |
|
Marion Muszynski
|
ff715abd60
|
Merge branch 'modif-css'
|
2016-07-01 16:44:13 +02:00 |
|
Marion Muszynski
|
47335062aa
|
Merge branch 'ticket-ecotax'
|
2016-07-01 12:27:13 +02:00 |
|
Marion Muszynski
|
1bb5ccc889
|
Merge branch 'modif-css' into develop
|
2016-07-01 11:29:20 +02:00 |
|
Marion Muszynski
|
6a87ea0460
|
modif add button
|
2016-07-01 11:29:00 +02:00 |
|
Marion Muszynski
|
c7aa42f883
|
fix conflict
|
2016-07-01 11:20:49 +02:00 |
|
Marion Muszynski
|
e40768c734
|
modif img reduction on product list
|
2016-07-01 11:18:52 +02:00 |
|
Marion Muszynski
|
155dd48cad
|
fix conflict
|
2016-07-01 11:02:09 +02:00 |
|
Srv Bebeboutik
|
c48e673922
|
fix prod
|
2016-06-30 11:31:11 +02:00 |
|
Marion Muszynski
|
699a06db48
|
fix conflict
|
2016-06-30 11:15:14 +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
|
dd9831daa5
|
Merge branch 'ticket-blockbestsellerProduct'
|
2016-06-28 15:55:39 +02:00 |
|
Marion Muszynski
|
757c557a07
|
fix conflict
|
2016-06-28 14:47:38 +02:00 |
|
Marion Muszynski
|
8a0b80e15e
|
pop error cart
|
2016-06-28 14:45:48 +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
|
fffeec4f63
|
Merge branch 'ticket-ecotax' into develop
|
2016-06-24 14:35:12 +02:00 |
|
Marion Muszynski
|
ced379c219
|
ecotax sentence
|
2016-06-24 14:34:15 +02:00 |
|
Marion Muszynski
|
f57b04dbde
|
fix conflict
|
2016-06-24 12:43:26 +02:00 |
|
Marion Muszynski
|
985bf52e83
|
update to add product with attribute to cart from bestsellers
|
2016-06-24 12:41:46 +02:00 |
|
Srv Bebeboutik
|
3b72e67b19
|
fix from prod
|
2016-06-24 10:09:27 +02:00 |
|
Marion Muszynski
|
03dd90bec5
|
update product tpl css
|
2016-06-23 10:16:07 +02:00 |
|
Marion Muszynski
|
f3fdc49173
|
fix conflict
|
2016-06-22 16:11:15 +02:00 |
|
Marion Muszynski
|
3e65d4ed6d
|
fix css
|
2016-06-22 15:50:00 +02:00 |
|
Marion Muszynski
|
77b9c22014
|
fix conflicts
|
2016-06-22 15:03:36 +02:00 |
|
Marion Muszynski
|
fcc0b6e2fc
|
Merge branch 'ticket-10254' into develop
|
2016-06-20 15:13:43 +02:00 |
|
Marion Muszynski
|
a11f4ad97e
|
modif button color
|
2016-06-20 15:13:18 +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
|
62a5f4cc32
|
Merge branch 'tiket-productTemplate' into develop
|
2016-06-09 11:49:55 +02:00 |
|
Marion Muszynski
|
7945d0c0ad
|
modif for ecotax style
|
2016-06-09 11:49:33 +02:00 |
|
Marion Muszynski
|
cf10bd3be0
|
fix conflicts
|
2016-06-08 17:15:28 +02:00 |
|
Marion Muszynski
|
0fcd71ee7d
|
Merge branch 'tiket-productTemplate' into develop
|
2016-06-08 14:29:52 +02:00 |
|
Marion Muszynski
|
2b2ae3fa8a
|
modif zoomdiv
|
2016-06-08 14:29:19 +02:00 |
|
Marion Muszynski
|
30b39b5776
|
fix conflicts
|
2016-06-08 10:53:07 +02:00 |
|
Marion Muszynski
|
f92562ca53
|
Merge branch 'ticket-fidelite' into develop
|
2016-06-08 10:38:22 +02:00 |
|
Marion Muszynski
|
b9f7b26a59
|
modif css shopping cart
|
2016-06-08 10:37:37 +02:00 |
|
Srv Bebeboutik
|
7025bce024
|
add phrase frais de port popup
|
2016-06-07 12:52:15 +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
|
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
|
15871cea67
|
Merge branch 'tiket-productTemplate' into develop
|
2016-06-01 14:40:11 +02:00 |
|
Marion Muszynski
|
289a55b5e4
|
small update
|
2016-06-01 14:39:30 +02:00 |
|
Marion Muszynski
|
349aa65a7d
|
Merge branch 'tiket-productTemplate' into develop
|
2016-06-01 12:57:39 +02:00 |
|
Marion Muszynski
|
e04cd105b8
|
modif code hex
|
2016-06-01 12:57:10 +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
|
aeb00544fb
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-30 18:07:07 +02:00 |
|