Marion Muszynski
|
5ad50e700a
|
Merge branch 'ticket-fidelite' into develop
|
2016-06-03 16:34:55 +02:00 |
|
Marion Muszynski
|
2dc90dc0c6
|
update to get Cart loyalty credit value without considering discount in total cart
|
2016-06-03 16:34:30 +02:00 |
|
Marion Muszynski
|
a426df2d86
|
Merge branch 'ticket-updateAttributeGroup'
|
2016-06-03 13:06:28 +02:00 |
|
Marion Muszynski
|
5f932e9bcd
|
opti attribute group deletion
|
2016-06-03 13:06:03 +02:00 |
|
Marion Muszynski
|
5371099ba2
|
Merge branch 'tiket-productTemplate' into develop
|
2016-06-03 12:16:54 +02:00 |
|
Marion Muszynski
|
192b88a451
|
adding delivery desc in product import
|
2016-06-03 12:16:33 +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 |
|
Srv Bebeboutik
|
b1a0a1b29e
|
small commit from prod
|
2016-06-03 11:18:35 +02:00 |
|
Marion Muszynski
|
f8aaf85d62
|
Merge branch 'ticket-dropshipping'
|
2016-06-02 12:19:46 +02:00 |
|
Marion Muszynski
|
332ac320fb
|
modif for prod
|
2016-06-02 12:19:24 +02:00 |
|
Marion Muszynski
|
ff9d838e60
|
Merge branch 'ticket-scaddressedit'
|
2016-06-02 11:29:22 +02:00 |
|
Marion Muszynski
|
91e2fb16ba
|
update scaddressedit with map
|
2016-06-02 11:28:50 +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
|
d0217bf4f6
|
Merge branch 'tiket-productTemplate' into develop
|
2016-06-01 12:52:13 +02:00 |
|
Marion Muszynski
|
700c5dc9e0
|
css modif
|
2016-06-01 12:51:53 +02:00 |
|
Marion Muszynski
|
fd42b0425b
|
Merge branch 'tiket-productTemplate' into develop
|
2016-06-01 12:48:12 +02:00 |
|
Marion Muszynski
|
71ba5e170a
|
small update
|
2016-06-01 12:47:48 +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
|
79964293be
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-31 16:34:15 +02:00 |
|
Marion Muszynski
|
ed9658e97e
|
comment facebook like
|
2016-05-31 16:33:28 +02:00 |
|
Marion Muszynski
|
aeb00544fb
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-30 18:07:07 +02:00 |
|
Marion Muszynski
|
cd56c49c48
|
modif css
|
2016-05-30 18:06:19 +02:00 |
|
Marion Muszynski
|
6c1d54467b
|
Merge branch 'ticket-fidelite' into develop
|
2016-05-30 17:52:52 +02:00 |
|
Marion Muszynski
|
725251f138
|
fix css
|
2016-05-30 17:52:18 +02:00 |
|
Marion Muszynski
|
df3661299e
|
Merge branch 'ticket-fidelite' into develop
|
2016-05-30 17:46:30 +02:00 |
|
Marion Muszynski
|
ed698c66f8
|
modif css
|
2016-05-30 17:45:51 +02:00 |
|
Marion Muszynski
|
66171d1e76
|
Merge branch 'ticket-fidelite' into develop
|
2016-05-30 17:42:05 +02:00 |
|
Marion Muszynski
|
0cf8ac97a9
|
modif css
|
2016-05-30 17:41:17 +02:00 |
|
Marion Muszynski
|
5dda7b4685
|
Merge branch 'ticket-fidelite' into develop
|
2016-05-30 17:17:26 +02:00 |
|
Marion Muszynski
|
fd0de8d0aa
|
other fix tpl
|
2016-05-30 17:16:54 +02:00 |
|
Marion Muszynski
|
17c8bd6122
|
Merge branch 'ticket-fidelite' into develop
|
2016-05-30 17:14:05 +02:00 |
|
Marion Muszynski
|
633643d0c7
|
fix pagination
|
2016-05-30 17:13:22 +02:00 |
|
Marion Muszynski
|
c7dac58b08
|
Merge branch 'ticket-fidelite' into develop
|
2016-05-30 17:04:57 +02:00 |
|
Marion Muszynski
|
e92682d851
|
modif tpl loyalty program
|
2016-05-30 17:04:26 +02:00 |
|
Marion Muszynski
|
85c2d3b45d
|
Merge branch 'ticket-fidelite' into develop
|
2016-05-30 16:33:46 +02:00 |
|
Marion Muszynski
|
93344e1770
|
fix shopping-cart tpl
|
2016-05-30 16:33:03 +02:00 |
|
Marion Muszynski
|
eb184fee4e
|
Merge branch 'ticket-fidelite' into develop
|
2016-05-30 16:31:03 +02:00 |
|
Marion Muszynski
|
02037dda1a
|
fix ratio
|
2016-05-30 16:30:32 +02:00 |
|
Marion Muszynski
|
2b14f9bd61
|
Merge branch 'ticket-dropshipping' into develop
|
2016-05-30 15:42:50 +02:00 |
|
Marion Muszynski
|
d63a2d7d5a
|
addind field to config if delivery of sale is enabled only in fr
|
2016-05-30 15:42:20 +02:00 |
|
Marion Muszynski
|
1611b7d87b
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-30 13:12:21 +02:00 |
|