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 |
|
Marion Muszynski
|
8b9edb3d67
|
modif admin product and import
|
2016-05-30 13:11:57 +02:00 |
|
Marion Muszynski
|
c9265f1116
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-30 12:07:47 +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
|
da020d7bc2
|
Merge branch 'ticket-phoneSocol' into develop
|
2016-05-30 10:50:22 +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
|
504aa9ba35
|
Merge branch 'ticket-updateStats' into develop
|
2016-05-27 10:19:39 +02:00 |
|