Commit Graph

2412 Commits

Author SHA1 Message Date
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
Michael RICOIS
3693455509 FR lang 2017-10-27 15:46:29 +02:00
Michael RICOIS
6b15c279b9 Date 2017-10-27 15:20:43 +02:00
Michael RICOIS
d193722c18 Change date calc 2017-10-27 14:45:36 +02:00
Marion Muszynski
b6700ea7ce add module 2017-10-27 13:16:02 +02:00
Marion Muszynski
df7f31db0b module wp generation 2017-10-27 13:11:37 +02:00
Michael RICOIS
2b9671cfe7 Add mail template 2017-10-27 12:44:41 +02:00
Michael RICOIS
e3c5b8a528 Specific with BPR (Point Relais mais Bureau De poste) 2017-10-26 17:14:02 +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
cdf4f68b74 change input to select 2017-10-23 16:18:37 +02:00
Michael RICOIS
bbc0573e37 Add shippinBack info 2017-10-23 11:56:43 +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
Michael RICOIS
7d2d8f1f03 Add a var when shipping is refund 2017-10-19 17:53:46 +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
Marion Muszynski
430de0c2e4 update philea to sync none philea sale after it s ended 2017-10-19 15:40:22 +02:00