Marion Muszynski
|
fe9de26a25
|
Merge branch 'ticket-13550-FixPayboxDirect' into develop
|
2017-06-23 10:11:24 +02:00 |
|
Marion Muszynski
|
2b858963a3
|
add comment
|
2017-06-23 10:11:06 +02:00 |
|
Marion Muszynski
|
4572379dfc
|
fix multi paiement and css
|
2017-06-22 16:53:29 +02:00 |
|
Marion Muszynski
|
9f25935902
|
Merge branch 'ticket-13389-3Dsecure'
|
2017-06-22 15:15:04 +02:00 |
|
Marion Muszynski
|
5d77439321
|
Merge branch 'ticket-13166-UpgradeReturnManager'
|
2017-06-22 11:38:52 +02:00 |
|
Marion Muszynski
|
d8dc176d53
|
Merge branch 'ticket-13389-3Dsecure' into develop
|
2017-06-21 16:48:01 +02:00 |
|
Marion Muszynski
|
d3e5dc18d0
|
test
|
2017-06-21 16:47:43 +02:00 |
|
Marion Muszynski
|
cf1b1eb2fc
|
Merge branch 'ticket-13389-3Dsecure' into develop
|
2017-06-21 16:39:12 +02:00 |
|
Marion Muszynski
|
a3dc8fa981
|
add 3Dsecure
|
2017-06-21 16:37:50 +02:00 |
|
Marion Muszynski
|
3cc85eb363
|
Merge branch 'ticket-13166-UpgradeReturnManager' into develop
|
2017-06-21 15:54:48 +02:00 |
|
Marion Muszynski
|
03c6b2c8bd
|
modif
|
2017-06-21 15:54:34 +02:00 |
|
Marion Muszynski
|
d1f1199517
|
Merge branch 'ticket-13166-UpgradeReturnManager' into develop
|
2017-06-21 14:44:30 +02:00 |
|
Marion Muszynski
|
805d225840
|
ergo changement and cleaning cron
|
2017-06-21 14:44:10 +02:00 |
|
Marion Muszynski
|
1524ec205c
|
Merge branch 'ticket-13532-ProductDisable'
|
2017-06-20 11:46:50 +02:00 |
|
Marion Muszynski
|
a10a145fce
|
Merge branch 'ticket-13532-ProductDisable' into develop
|
2017-06-20 10:59:24 +02:00 |
|
Marion Muszynski
|
92bd1d406d
|
fix css
|
2017-06-20 10:59:11 +02:00 |
|
Marion Muszynski
|
d3e9c70bd8
|
Merge branch 'ticket-13532-ProductDisable' into develop
|
2017-06-20 10:09:22 +02:00 |
|
Marion Muszynski
|
1f971275a0
|
multiple disable/enable product
|
2017-06-20 10:09:07 +02:00 |
|
Marion Muszynski
|
12e744b313
|
Merge branch 'ticket-9103-UrlMetaCategory'
|
2017-06-20 09:51:32 +02:00 |
|
Marion Muszynski
|
b9edddd928
|
Merge branch 'ticket-13532-ProductDisable'
|
2017-06-20 09:45:04 +02:00 |
|
Marion Muszynski
|
d1e71015d5
|
Merge branch 'ticket-13532-ProductDisable' into develop
|
2017-06-19 17:48:53 +02:00 |
|
Marion Muszynski
|
15e76afb93
|
multi disable/enable product
|
2017-06-19 17:48:38 +02:00 |
|
Marion Muszynski
|
3b2bf29f7f
|
Merge branch 'ticket-13516-removeCategoryAddButton'
|
2017-06-19 12:21:28 +02:00 |
|
Marion Muszynski
|
5e88037ef6
|
Merge branch 'ticket-13516-removeCategoryAddButton' into develop
|
2017-06-19 12:18:42 +02:00 |
|
Marion Muszynski
|
fec2e5ba19
|
remove add buttom
|
2017-06-19 12:18:25 +02:00 |
|
Marion Muszynski
|
6d09c9ca30
|
Merge branch 'ticket-13324-pixelFB'
|
2017-06-19 11:06:27 +02:00 |
|
Marion Muszynski
|
77f3034f5f
|
Merge branch 'ticket-13324-pixelFB' into develop
|
2017-06-19 11:06:04 +02:00 |
|
Marion Muszynski
|
86ccf2ef15
|
check if customer already exists to prevent fb tracking resending for registration
|
2017-06-19 11:05:46 +02:00 |
|
Marion Muszynski
|
8d98b4f8e1
|
Merge branch 'ticket11985-invoiceMR' into develop
|
2017-06-16 17:51:35 +02:00 |
|
Marion Muszynski
|
dadf16f8fb
|
separate la poste invoices and mr invoices
|
2017-06-16 17:51:19 +02:00 |
|
Marion Muszynski
|
30fe998858
|
Merge branch 'ticket-11985-statLogMR'
|
2017-06-16 14:53:06 +02:00 |
|
Marion Muszynski
|
86f576af74
|
remove philea part
|
2017-06-16 14:52:50 +02:00 |
|
Marion Muszynski
|
dde433e46a
|
start of changement
|
2017-06-16 14:49:10 +02:00 |
|
Marion Muszynski
|
457f636f6e
|
Merge branch 'ticket-11985-statLogMR'
|
2017-06-16 14:21:20 +02:00 |
|
Marion Muszynski
|
2bee96172e
|
Merge branch 'ticket-11985-statLogMR' into develop
|
2017-06-16 14:20:55 +02:00 |
|
Marion Muszynski
|
45d7d61848
|
add philea and futur MR expe to logistic stats
|
2017-06-16 14:20:34 +02:00 |
|
Marion Muszynski
|
51df5aed18
|
Merge branch 'fix-antConfiguration'
|
2017-06-16 11:09:33 +02:00 |
|
Marion Muszynski
|
b02d84d2f7
|
optimization query categories
|
2017-06-16 11:09:15 +02:00 |
|
Marion Muszynski
|
945fdf6649
|
Merge branch 'ticket-ManyOrderPdf'
|
2017-06-16 10:59:19 +02:00 |
|
Marion Muszynski
|
27b1222817
|
add mutiple invoice generation for one csv
|
2017-06-16 10:59:02 +02:00 |
|
Marion Muszynski
|
59e7118dc7
|
Merge branch 'ticket-13024-UpdBDC'
|
2017-06-15 16:42:28 +02:00 |
|
Marion Muszynski
|
6bdea321da
|
fix footer
|
2017-06-15 16:42:13 +02:00 |
|
Marion Muszynski
|
e75b5c16ba
|
Merge branch 'ticket-13024-UpdBDC'
|
2017-06-15 16:20:37 +02:00 |
|
Marion Muszynski
|
3f775a0fec
|
Merge branch 'ticket-paypalError' into develop
|
2017-06-15 16:19:42 +02:00 |
|
Marion Muszynski
|
9e79b4dfc4
|
fix error when amount is 0
|
2017-06-15 16:19:26 +02:00 |
|
Marion Muszynski
|
06daeaf29e
|
Merge branch 'ticket-13024-UpdBDC' into develop
|
2017-06-14 17:03:46 +02:00 |
|
Marion Muszynski
|
62e0b6a8f1
|
upgrade adminlog for bdc
|
2017-06-14 17:03:25 +02:00 |
|
Marion Muszynski
|
42951e75b3
|
Merge branch 'ticket-13473-IVAForEs'
|
2017-06-14 11:58:09 +02:00 |
|
Marion Muszynski
|
d11e800d34
|
Merge branch 'ticket-13473-IVAForEs' into develop
|
2017-06-14 11:57:41 +02:00 |
|
Marion Muszynski
|
96b66b0eae
|
fix translation
|
2017-06-14 11:57:18 +02:00 |
|