Marion Muszynski
|
c0e5759f2d
|
Merge branch 'ticket-adminProduct'
|
2016-06-06 14:35:48 +02:00 |
|
Marion Muszynski
|
b332800b77
|
new fields in product db
|
2016-06-06 14:35:07 +02:00 |
|
Srv Bebeboutik
|
7085c1b80a
|
update from prod
|
2016-06-06 12:35:00 +02:00 |
|
Srv Bebeboutik
|
aed5599765
|
redelte config
|
2016-06-06 12:03:36 +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
|
e671934026
|
fix
|
2016-06-06 12:03:10 +02:00 |
|
Srv Bebeboutik
|
07e93d921d
|
fix
|
2016-06-06 12:03:00 +02:00 |
|
Srv Bebeboutik
|
2860eb56fc
|
delte config
|
2016-06-06 12:02:13 +02:00 |
|
Srv Bebeboutik
|
5b39f81419
|
add config
|
2016-06-06 12:01:39 +02:00 |
|
Thibault UBUNTU
|
5e382e94be
|
fix config
|
2016-06-06 12:00:09 +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 |
|
Srv Bebeboutik
|
a4a5f4850d
|
petite modif from prod
|
2016-06-06 10:24:06 +02:00 |
|
Srv Bebeboutik
|
e26cefa86a
|
modif prod
|
2016-06-06 10:14:02 +02:00 |
|
Srv Bebeboutik
|
368307c6e2
|
modif from prod
|
2016-06-03 17:04:45 +02:00 |
|
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 |
|