Marion Muszynski
|
cf81f171ca
|
Merge branch 'ticket-13015-modifAdminSale' into develop
|
2017-04-13 13:02:06 +02:00 |
|
Marion Muszynski
|
d72262dd99
|
add override employee
|
2017-04-13 13:01:51 +02:00 |
|
Marion Muszynski
|
8f62586369
|
fix conflict
|
2017-04-11 12:08:19 +02:00 |
|
Marion Muszynski
|
89f72c7045
|
Merge branch 'ticket-12462-returnMR'
|
2017-04-06 16:24:22 +02:00 |
|
Marion Muszynski
|
6e1bbf4d95
|
Merge branch 'ticket-12452-SAVMessHistory' into develop
|
2017-04-06 16:10:42 +02:00 |
|
Marion Muszynski
|
2b861808e0
|
addition of conversation history in customer thread
|
2017-04-06 16:10:25 +02:00 |
|
Marion Muszynski
|
d847224f01
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 11:38:01 +01:00 |
|
Marion Muszynski
|
33cd9f3d08
|
continuation
|
2017-03-09 11:37:44 +01:00 |
|
Marion Muszynski
|
b38e5c87ab
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 10:54:11 +01:00 |
|
Marion Muszynski
|
f1e3151dac
|
fix ssl
|
2017-03-09 10:53:26 +01:00 |
|
Marion Muszynski
|
67d70b33e0
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-08 18:05:32 +01:00 |
|
Marion Muszynski
|
8051a5e9c2
|
fix redirect loop
|
2017-03-08 18:05:04 +01:00 |
|
Marion Muszynski
|
e554592f77
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-08 17:51:22 +01:00 |
|
Marion Muszynski
|
0658afedc6
|
other fixes
|
2017-03-08 17:50:41 +01:00 |
|
Marion Muszynski
|
fdd9dfc243
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-08 17:35:47 +01:00 |
|
Marion Muszynski
|
6a02d5ae5c
|
add getPageLinkSsl
|
2017-03-08 17:35:26 +01:00 |
|
Marion Muszynski
|
bbe29db5e9
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-08 17:28:15 +01:00 |
|
Marion Muszynski
|
ebcf6fe55b
|
fix useSSL
|
2017-03-08 17:27:37 +01:00 |
|
Marion Muszynski
|
833315393a
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-08 17:19:54 +01:00 |
|
Marion Muszynski
|
9581b90d6c
|
fix protocol
|
2017-03-08 17:19:26 +01:00 |
|
Marion Muszynski
|
17c6ac82b6
|
fix bugs
|
2017-03-08 16:11:36 +01:00 |
|
Marion Muszynski
|
2e6e1d23ec
|
start of changement to full https
|
2017-03-08 16:10:35 +01:00 |
|
Marion Muszynski
|
8bd907d1bd
|
Merge branch 'ticket-12591-MarketingModifications' into develop
|
2017-03-07 13:26:08 +01:00 |
|
Marion Muszynski
|
ee271d98c8
|
continuation of updating of market data with addition of remove from cart to GA and addition of name of sale when product is sent to GA
|
2017-03-07 13:25:46 +01:00 |
|
Marion Muszynski
|
208f2e2476
|
Merge branch 'ticket-12462-returnMR' into develop
|
2017-02-21 14:25:07 +01:00 |
|
Marion Muszynski
|
40596721a0
|
fix conflicts
|
2017-02-21 11:51:37 +01:00 |
|
Marion Muszynski
|
2837aea4a5
|
addition of picto for random product
|
2017-02-21 11:49:55 +01:00 |
|
Marion Muszynski
|
8a61a09988
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-02-15 11:39:15 +01:00 |
|
Marion Muszynski
|
0bc72ecb87
|
Merge branch 'ticket-10393'
|
2017-02-08 14:49:31 +01:00 |
|
Marion Muszynski
|
3b7bde22db
|
addition of mondial relay return process in adminOrder
|
2017-02-06 16:07:35 +01:00 |
|
Marion Muszynski
|
fce0de0f03
|
Merge branch 'ticket-12397-LinkCategoryWithDiscount' into develop
|
2017-01-30 15:08:27 +01:00 |
|
Marion Muszynski
|
25447fd61a
|
addition of discount category checking
|
2017-01-30 15:08:10 +01:00 |
|
Marion Muszynski
|
8204486942
|
update cron and mail conf_order
|
2017-01-26 15:32:22 +01:00 |
|
Marion Muszynski
|
5f40792fa8
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-01-12 14:33:17 +01:00 |
|
Marion Muszynski
|
c75ac311d8
|
fix paymentModule
|
2017-01-12 14:31:57 +01:00 |
|
Marion Muszynski
|
0347a73068
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-01-12 13:04:20 +01:00 |
|
Marion Muszynski
|
9b2f18c2ef
|
fix wsu laposte, addition in adminLogistics and ajax for MR
|
2017-01-12 13:03:48 +01:00 |
|
Marion Muszynski
|
2cf8ec1073
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-01-11 18:26:59 +01:00 |
|
Marion Muszynski
|
4716b247d9
|
fix
|
2017-01-11 18:26:36 +01:00 |
|
Marion Muszynski
|
4aca04400e
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-01-11 18:11:49 +01:00 |
|
Marion Muszynski
|
092a1b169b
|
fix
|
2017-01-11 18:11:29 +01:00 |
|
Marion Muszynski
|
39db1b8145
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-01-11 18:02:51 +01:00 |
|
Marion Muszynski
|
262cac694a
|
change message in mail order_conf
|
2017-01-11 18:02:31 +01:00 |
|
Marion Muszynski
|
654908b9bf
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-01-11 16:58:28 +01:00 |
|
Marion Muszynski
|
80e0bffe4f
|
fix for dev
|
2017-01-11 16:58:05 +01:00 |
|
Marion Muszynski
|
682d0b48f8
|
fix conflicts
|
2017-01-11 15:55:31 +01:00 |
|
Marion Muszynski
|
c4cbe24bb5
|
addition of crons and admin_order tpl for Mondial Relay
|
2017-01-11 15:53:24 +01:00 |
|
Marion Muszynski
|
6e48dd3722
|
Merge branch 'ticket-10393' into develop
|
2017-01-10 11:22:30 +01:00 |
|
Marion Muszynski
|
1146df59c8
|
Merge branch 'ticket-12197-NewDiscountAdminOrder' into develop
|
2017-01-09 12:04:13 +01:00 |
|
Marion Muszynski
|
a29a54f41e
|
addition of new discount of 5 for missing product
|
2017-01-09 12:03:58 +01:00 |
|