665 Commits

Author SHA1 Message Date
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
192b88a451 adding delivery desc in product import 2016-06-03 12:16:33 +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
289a55b5e4 small update 2016-06-01 14:39:30 +02:00
Marion Muszynski
e04cd105b8 modif code hex 2016-06-01 12:57:10 +02:00
Marion Muszynski
700c5dc9e0 css modif 2016-06-01 12:51:53 +02:00
Marion Muszynski
71ba5e170a small update 2016-06-01 12:47:48 +02:00
Marion Muszynski
d59e49e3ba update scrollbar color and more 2016-06-01 12:43:12 +02:00
Marion Muszynski
3e0ad8592d update link 2016-06-01 11:23:37 +02:00
Marion Muszynski
96ca86fe85 modif error message 2016-06-01 10:57:31 +02:00
Marion Muszynski
ed9658e97e comment facebook like 2016-05-31 16:33:28 +02:00
Marion Muszynski
cd56c49c48 modif css 2016-05-30 18:06:19 +02:00
Marion Muszynski
725251f138 fix css 2016-05-30 17:52:18 +02:00
Marion Muszynski
ed698c66f8 modif css 2016-05-30 17:45:51 +02:00
Marion Muszynski
0cf8ac97a9 modif css 2016-05-30 17:41:17 +02:00
Marion Muszynski
fd0de8d0aa other fix tpl 2016-05-30 17:16:54 +02:00
Marion Muszynski
633643d0c7 fix pagination 2016-05-30 17:13:22 +02:00
Marion Muszynski
e92682d851 modif tpl loyalty program 2016-05-30 17:04:26 +02:00
Marion Muszynski
93344e1770 fix shopping-cart tpl 2016-05-30 16:33:03 +02:00
Marion Muszynski
02037dda1a fix ratio 2016-05-30 16:30:32 +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
8b9edb3d67 modif admin product and import 2016-05-30 13:11:57 +02:00
Marion Muszynski
a4ad9d98b0 modif tpl product css 2016-05-30 12:07:24 +02:00
Marion Muszynski
a829c09c89 Merge branch 'ticket-phoneSocol' 2016-05-30 11:46:32 +02:00
Marion Muszynski
7e74c8b58a modif to take phone number if no mobile phone 2016-05-27 17:22:48 +02:00
Srv Bebeboutik
2f6c21e7fb push de la prod 2016-05-27 16:59:18 +02:00
Marion Muszynski
cb02563fa9 Merge branch 'ticket-updateStats' 2016-05-27 15:01:42 +02:00
Marion Muszynski
722713d96c test 2016-05-27 15:01:16 +02:00
Marion Muszynski
83e9e484ef Merge branch 'ticket-updateStats' 2016-05-27 14:58:30 +02:00
Marion Muszynski
a8bdea5899 opti again 2016-05-27 14:58:08 +02:00
Marion Muszynski
a2084bd3cf Merge branch 'ticket-updateStats' 2016-05-27 12:57:53 +02:00
Marion Muszynski
b59c00ffcd adding another reason 2016-05-27 12:57:32 +02:00
Marion Muszynski
b135394369 Merge branch 'ticket-updateStats' 2016-05-27 12:42:39 +02:00
Marion Muszynski
40680b0020 opti export 2016-05-27 12:42:09 +02:00
Marion Muszynski
b3956b5592 Merge branch 'ticket-updateStats' 2016-05-27 12:36:23 +02:00
Marion Muszynski
d3b2f14bc9 continuing... 2016-05-27 12:35:51 +02:00
Marion Muszynski
5e3f9a31e7 Merge branch 'ticket-updateStats' 2016-05-27 11:27:53 +02:00
Marion Muszynski
2ce1f5fafe continuing of otpi 2016-05-27 11:27:09 +02:00
Marion Muszynski
b63707f242 Merge branch 'ticket-updateStats' 2016-05-27 10:45:58 +02:00
Marion Muszynski
067eebea21 beginning of opti requete export 2016-05-27 10:45:22 +02:00
Marion Muszynski
750779f200 Merge branch 'ticket-updateStats' 2016-05-27 10:23:16 +02:00
Marion Muszynski
3b8156458b adding export remb 2016-05-27 10:19:09 +02:00
Marion Muszynski
66c93d1ed1 Merge branch 'ticket-updateBraderie' 2016-05-26 17:53:15 +02:00
Marion Muszynski
ab70428dd4 update braderie 2016-05-26 17:50:44 +02:00