Marion Muszynski
|
9562aa2e68
|
Merge branch 'ticket-12868-WhiteBG' into develop
|
2017-10-25 14:55:46 +02:00 |
|
Marion Muszynski
|
6b297128bb
|
change payment img
|
2017-10-25 14:55:29 +02:00 |
|
Marion Muszynski
|
2ea53f44ab
|
Merge branch 'fix-namePromoBanner' into develop
|
2017-10-24 18:30:31 +02:00 |
|
Marion Muszynski
|
61a00eafbd
|
fix in tpl
|
2017-10-24 18:30:20 +02:00 |
|
Marion Muszynski
|
53b8a9d4ee
|
fix conflict
|
2017-10-24 18:26:36 +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
|
161673618e
|
Merge branch 'fix-resetpassword-include' into develop
|
2017-10-24 10:27:54 +02:00 |
|
Marion Muszynski
|
ef97bdfc53
|
fix required paths
|
2017-10-24 10:27:38 +02:00 |
|
Marion Muszynski
|
0c8837cfbe
|
Merge branch 'ticket-14485-UpdatePhilea' into develop
|
2017-10-23 16:18:52 +02:00 |
|
Marion Muszynski
|
cdf4f68b74
|
change input to select
|
2017-10-23 16:18:37 +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
|
7b78add4b8
|
Merge branch 'ticket-14526-LoyaltyPaymentError' into develop
|
2017-10-19 18:11:33 +02:00 |
|
Marion Muszynski
|
3d236965be
|
fix query 2
|
2017-10-19 18:11:19 +02:00 |
|
Marion Muszynski
|
5c7c20a708
|
Merge branch 'ticket-14526-LoyaltyPaymentError' into develop
|
2017-10-19 17:16:13 +02:00 |
|
Marion Muszynski
|
b7960424df
|
fix query
|
2017-10-19 17:16:01 +02:00 |
|
Marion Muszynski
|
df52811ada
|
Merge branch 'ticket-14526-LoyaltyPaymentError' into develop
|
2017-10-19 17:13:41 +02:00 |
|
Marion Muszynski
|
63d71c85be
|
not display when order has payment error state
|
2017-10-19 17:13:23 +02:00 |
|
Marion Muszynski
|
e6452dbab7
|
Merge branch 'ticket-12868-WhiteBG' into develop
|
2017-10-19 16:35:25 +02:00 |
|
Marion Muszynski
|
151c9a59c2
|
continuing of inte
|
2017-10-19 16:35:09 +02:00 |
|
Marion Muszynski
|
7d7003353c
|
Merge branch 'ticket-14485-UpdatePhilea' into develop
|
2017-10-19 15:40:37 +02:00 |
|
Marion Muszynski
|
430de0c2e4
|
update philea to sync none philea sale after it s ended
|
2017-10-19 15:40:22 +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
|
c028e2a65c
|
beginning of update
|
2017-10-17 16:22:24 +02:00 |
|
Marion Muszynski
|
508cf3359e
|
Merge branch 'ticket-14231-inteMobile'
|
2017-10-13 11:19:28 +02:00 |
|
Marion Muszynski
|
f36495dcfb
|
Merge branch 'ticket-14231-inteMobile' into develop
|
2017-10-13 11:17:51 +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
|
d38c7816ff
|
Merge branch 'ticket-14486-MRinvoice' into develop
|
2017-10-12 15:03:33 +02:00 |
|
Marion Muszynski
|
ff34c7b32e
|
add mr and dropshipping sended check for invoice
|
2017-10-12 15:03:08 +02:00 |
|
Marion Muszynski
|
f33d4403a5
|
fix conflict
|
2017-10-12 13:59:34 +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
|
abd2344c77
|
fix conflict
|
2017-10-12 09:58:55 +02:00 |
|
Marion Muszynski
|
8d0392bd44
|
fix pink color
|
2017-10-12 09:57:46 +02:00 |
|
Marion Muszynski
|
8b9c4b4812
|
Merge branch 'ticket-14460-BugReturnProcess'
|
2017-10-11 16:18:58 +02:00 |
|
Marion Muszynski
|
e300ed0dfc
|
Merge branch 'ticket-14460-BugReturnProcess' into develop
|
2017-10-11 16:15:14 +02:00 |
|