Marion Muszynski
|
4823dd518b
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 11:07:29 +01:00 |
|
Marion Muszynski
|
52a3477a1e
|
fix //static
|
2017-03-09 11:07:11 +01:00 |
|
Marion Muszynski
|
ba2adf4ec8
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 11:00:36 +01:00 |
|
Marion Muszynski
|
1bd2edfe4d
|
other fix getpagelink
|
2017-03-09 11:00:20 +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
|
031d187ba7
|
Merge branch 'ticket-12462-returnMR' into develop
|
2017-03-07 17:49:51 +01:00 |
|
Marion Muszynski
|
29d133070d
|
fix re-sending return instructions
|
2017-03-07 17:49:34 +01:00 |
|
Marion Muszynski
|
a2160cde3c
|
Merge branch 'ticket-12462-returnMR' into develop
|
2017-03-07 17:33:37 +01:00 |
|
Marion Muszynski
|
29a1b8a743
|
addition of button to resend return instruction
|
2017-03-07 17:33:22 +01:00 |
|
Marion Muszynski
|
cc9361ea09
|
Merge branch 'ticket-12462-returnMR' into develop
|
2017-03-07 16:27:04 +01:00 |
|
Marion Muszynski
|
91dfc72786
|
fix mail fr
|
2017-03-07 16:07:54 +01:00 |
|
Marion Muszynski
|
8fabe0bfa7
|
Merge branch 'ticket-12591-MarketingModifications'
|
2017-03-07 15:54:28 +01:00 |
|
Marion Muszynski
|
95088f2d38
|
Merge branch 'ticket-12591-MarketingModifications' into develop
|
2017-03-07 14:41:02 +01:00 |
|
Marion Muszynski
|
179f73f171
|
fix
|
2017-03-07 14:40:09 +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
|
ce784cd72b
|
Merge branch 'ticket-12659-PrintEan'
|
2017-03-06 17:05:46 +01:00 |
|
Marion Muszynski
|
28241acf6b
|
add ref and name for print ean management in product BO
|
2017-03-06 17:05:28 +01:00 |
|
Marion Muszynski
|
601e396791
|
Merge branch 'ticket-12692-LabelGenerate'
|
2017-03-06 12:57:59 +01:00 |
|
Marion Muszynski
|
eae3fc73a4
|
last fix for label size
|
2017-03-06 12:57:45 +01:00 |
|
Marion Muszynski
|
ef59b585a0
|
Merge branch 'ticket-12591-MarketingModifications'
|
2017-03-03 13:23:05 +01:00 |
|
Marion Muszynski
|
a6fe73118a
|
Merge branch 'ticket-12591-MarketingModifications' into develop
|
2017-03-03 13:21:23 +01:00 |
|
Marion Muszynski
|
92c5988b96
|
differentiation of url order
|
2017-03-03 13:21:08 +01:00 |
|
Marion Muszynski
|
332c5fdecf
|
Merge branch 'fix-exportSale'
|
2017-03-03 12:04:48 +01:00 |
|
Marion Muszynski
|
aba69ee44f
|
move id category after name in file name
|
2017-03-03 12:04:35 +01:00 |
|
Marion Muszynski
|
d95d5f8639
|
Merge branch 'fix-helperForm'
|
2017-03-03 12:01:49 +01:00 |
|
Marion Muszynski
|
d2e4809912
|
fix warning
|
2017-03-03 12:01:30 +01:00 |
|
Marion Muszynski
|
dce4d904fb
|
Merge branch 'fix-helperForm'
|
2017-03-03 11:59:49 +01:00 |
|
Marion Muszynski
|
e152e10882
|
fix warning
|
2017-03-03 11:59:34 +01:00 |
|
Marion Muszynski
|
3e3ba61d50
|
Merge branch 'fix-exportSale'
|
2017-03-03 11:52:40 +01:00 |
|
Marion Muszynski
|
051b3b965b
|
fix name of sale export file with adding id category
|
2017-03-03 11:52:10 +01:00 |
|
Marion Muszynski
|
b988870c40
|
Merge branch 'ticket-12462-returnMR' into develop
|
2017-03-03 10:59:12 +01:00 |
|
Marion Muszynski
|
e120917ca0
|
addition of herper for return order search
|
2017-03-03 10:58:46 +01:00 |
|
Marion Muszynski
|
766c431f87
|
Merge branch 'ticket-12692-LabelGenerate'
|
2017-03-02 17:10:12 +01:00 |
|
Marion Muszynski
|
a213779459
|
fix size
|
2017-03-02 17:09:58 +01:00 |
|
Marion Muszynski
|
3cca42ad85
|
Merge branch 'ticket-12692-LabelGenerate'
|
2017-03-02 10:33:29 +01:00 |
|
Marion Muszynski
|
3d3d01f32a
|
Merge branch 'ticket-12692-LabelGenerate' into develop
|
2017-03-02 10:33:05 +01:00 |
|