Srv Bebeboutik
|
49e26669a9
|
modif from prod
|
2016-06-07 11:22:35 +02:00 |
|
Marion Muszynski
|
59efa679b3
|
Merge branch 'ticket-9893'
|
2016-06-06 17:50:54 +02:00 |
|
Marion Muszynski
|
7ad38029da
|
adding filter
|
2016-06-06 17:27:09 +02:00 |
|
Srv Bebeboutik
|
bec4b56f27
|
modif from prod to get real numbers for export
|
2016-06-06 15:32:42 +02:00 |
|
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
|
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 |
|
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
|
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
|
d63a2d7d5a
|
addind field to config if delivery of sale is enabled only in fr
|
2016-05-30 15:42:20 +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 |
|