Marion Muszynski
|
6f3b5615dc
|
Merge branch 'ticket-12868-WhiteBG'
|
2017-10-30 11:35:14 +01:00 |
|
root
|
690a60f4ad
|
fix from prod for payment modules
|
2017-10-30 11:34:13 +01:00 |
|
Marion Muszynski
|
1585057079
|
Merge branch 'fix-pdf'
|
2017-10-27 16:30:33 +02:00 |
|
Marion Muszynski
|
b20b9ede8f
|
fix offset i
|
2017-10-27 16:30:17 +02:00 |
|
Marion Muszynski
|
986645f92a
|
Merge branch 'fix-forApp'
|
2017-10-27 16:19:39 +02:00 |
|
Marion Muszynski
|
0f810abd18
|
fix fraud paybox when i is empty
|
2017-10-27 16:19:20 +02:00 |
|
Marion Muszynski
|
2ea2904374
|
Merge branch 'fix-forApp'
|
2017-10-27 16:16:09 +02:00 |
|
Marion Muszynski
|
8bcf9fe456
|
fix swift header preg_replace
|
2017-10-27 16:15:54 +02:00 |
|
Marion Muszynski
|
4d10fd421e
|
Merge branch 'fix-pdf'
|
2017-10-27 16:02:03 +02:00 |
|
Marion Muszynski
|
b25b946e8d
|
fix when i++ not set
|
2017-10-27 16:01:48 +02:00 |
|
Marion Muszynski
|
58d248143b
|
Merge branch 'fix-futureCache'
|
2017-10-25 15:48:16 +02:00 |
|
Marion Muszynski
|
f64bc5ff1f
|
fix for admin
|
2017-10-25 15:48:01 +02:00 |
|
Marion Muszynski
|
6da677a5f3
|
Merge branch 'fix-futureCache'
|
2017-10-25 15:37:28 +02:00 |
|
Marion Muszynski
|
d62919e240
|
uncache future sale
|
2017-10-25 15:37:15 +02:00 |
|
Marion Muszynski
|
0674d7d978
|
Merge branch 'app-addImgListOff'
|
2017-10-25 15:06:59 +02:00 |
|
Marion Muszynski
|
35e786058c
|
add mobile off img
|
2017-10-25 15:06:50 +02:00 |
|
Marion Muszynski
|
6b297128bb
|
change payment img
|
2017-10-25 14:55:29 +02:00 |
|
Marion Muszynski
|
96a0f240f2
|
Merge branch 'add-CacheRedis'
|
2017-10-25 14:31:25 +02:00 |
|
Marion Muszynski
|
5536b0c340
|
add predis folder into tools
|
2017-10-25 13:53:42 +02:00 |
|
Marion Muszynski
|
54977daec7
|
Merge branch 'fix-namePromoBanner'
|
2017-10-24 18:35:21 +02:00 |
|
Marion Muszynski
|
61a00eafbd
|
fix in tpl
|
2017-10-24 18:30:20 +02:00 |
|
Marion Muszynski
|
20ab1d75d9
|
change to update img promo banner
|
2017-10-24 18:24:17 +02:00 |
|
Marion Muszynski
|
f5f865dc54
|
Merge branch 'fix-dropcsv'
|
2017-10-24 16:44:19 +02:00 |
|
Marion Muszynski
|
85bb191d49
|
fix
|
2017-10-24 16:44:04 +02:00 |
|
Marion Muszynski
|
203ebfdcfd
|
Merge branch 'mv-autoload_api'
|
2017-10-24 16:33:30 +02:00 |
|
Marion Muszynski
|
d11248dcc8
|
add autoload in config
|
2017-10-24 16:33:22 +02:00 |
|
Marion Muszynski
|
dd66b3adc2
|
Merge branch 'mv-autoload_api'
|
2017-10-24 16:32:27 +02:00 |
|
Marion Muszynski
|
f61e9885be
|
move autoload api
|
2017-10-24 16:32:08 +02:00 |
|
Marion Muszynski
|
51b35e6ed9
|
Merge branch 'feature/api_bbb' into 'master'
autoload for bbb api
See merge request !4
|
2017-10-24 15:53:17 +02:00 |
|
Christophe LATOUR
|
66f30edbc6
|
autoload for bbb api
|
2017-10-24 14:59:52 +02:00 |
|
Marion Muszynski
|
437943bce7
|
Merge branch 'ticket-14260-FixCronTraceMr'
|
2017-10-24 11:03:48 +02:00 |
|
Marion Muszynski
|
824b68b169
|
fix cron trace for order state changement
|
2017-10-24 11:03:33 +02:00 |
|
Marion Muszynski
|
40259c29da
|
Merge branch 'fix-resetpassword-include'
|
2017-10-24 10:29:23 +02:00 |
|
Marion Muszynski
|
ef97bdfc53
|
fix required paths
|
2017-10-24 10:27:38 +02:00 |
|
Marion Muszynski
|
c0f9476da6
|
Merge branch 'ticket-14589-bugDelay'
|
2017-10-23 10:10:46 +02:00 |
|
Marion Muszynski
|
fc08dfd0eb
|
fix delay in admin privatesale
|
2017-10-23 10:10:05 +02:00 |
|
Marion Muszynski
|
5ad241d87e
|
Merge branch 'ticket-14526-LoyaltyPaymentError'
|
2017-10-19 18:12:59 +02:00 |
|
Marion Muszynski
|
3d236965be
|
fix query 2
|
2017-10-19 18:11:19 +02:00 |
|
Marion Muszynski
|
b7960424df
|
fix query
|
2017-10-19 17:16:01 +02:00 |
|
Marion Muszynski
|
63d71c85be
|
not display when order has payment error state
|
2017-10-19 17:13:23 +02:00 |
|
Marion Muszynski
|
151c9a59c2
|
continuing of inte
|
2017-10-19 16:35:09 +02:00 |
|
root
|
9c97f5ff94
|
fix and translation from prod
|
2017-10-18 12:10:35 +02:00 |
|
Marion Muszynski
|
1dc2a7f6b2
|
fix conflict
|
2017-10-17 16:29:54 +02:00 |
|
Marion Muszynski
|
508cf3359e
|
Merge branch 'ticket-14231-inteMobile'
|
2017-10-13 11:19:28 +02:00 |
|
Marion Muszynski
|
9823ff1d0b
|
inte order detail mobile
|
2017-10-13 11:17:27 +02:00 |
|
Marion Muszynski
|
b698be44f9
|
Merge branch 'ticket-14486-MRinvoice'
|
2017-10-12 15:05:04 +02:00 |
|
Marion Muszynski
|
ff34c7b32e
|
add mr and dropshipping sended check for invoice
|
2017-10-12 15:03:08 +02:00 |
|
Marion Muszynski
|
13843bc270
|
integration for white bg
|
2017-10-12 13:58:41 +02:00 |
|
Marion Muszynski
|
1bc46e9610
|
Merge branch 'ticket-14447-AF'
|
2017-10-12 10:01:13 +02:00 |
|
Marion Muszynski
|
8d0392bd44
|
fix pink color
|
2017-10-12 09:57:46 +02:00 |
|