Marion Muszynski
|
8051a5e9c2
|
fix redirect loop
|
2017-03-08 18:05:04 +01:00 |
|
Marion Muszynski
|
0658afedc6
|
other fixes
|
2017-03-08 17:50:41 +01:00 |
|
Marion Muszynski
|
6a02d5ae5c
|
add getPageLinkSsl
|
2017-03-08 17:35:26 +01:00 |
|
Marion Muszynski
|
ebcf6fe55b
|
fix useSSL
|
2017-03-08 17:27:37 +01:00 |
|
Marion Muszynski
|
9581b90d6c
|
fix protocol
|
2017-03-08 17:19:26 +01:00 |
|
Marion Muszynski
|
2e6e1d23ec
|
start of changement to full https
|
2017-03-08 16:10:35 +01:00 |
|
Marion Muszynski
|
8fabe0bfa7
|
Merge branch 'ticket-12591-MarketingModifications'
|
2017-03-07 15:54:28 +01:00 |
|
Marion Muszynski
|
179f73f171
|
fix
|
2017-03-07 14:40:09 +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
|
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
|
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
|
e2aff37345
|
bigger font size for ref and product name
|
2017-03-02 10:32:48 +01:00 |
|
Marion Muszynski
|
25d7f3c817
|
Merge branch 'ticket-12642-blocktext2'
|
2017-03-01 11:34:56 +01:00 |
|
Marion Muszynski
|
7a956baf2e
|
addition of sentence in blocktext2
|
2017-03-01 11:34:40 +01:00 |
|
Marion Muszynski
|
5bcad477aa
|
Merge branch 'ticket-12643-ExportLoyalty'
|
2017-02-28 16:04:10 +01:00 |
|
Marion Muszynski
|
66cce58d00
|
update message info
|
2017-02-28 16:03:58 +01:00 |
|
Marion Muszynski
|
f5ee58457d
|
Merge branch 'ticket-12643-ExportLoyalty'
|
2017-02-28 15:56:45 +01:00 |
|
Marion Muszynski
|
180bccea8d
|
fix request
|
2017-02-28 15:54:54 +01:00 |
|
Marion Muszynski
|
642a447760
|
addition of export loyalty details
|
2017-02-28 12:55:32 +01:00 |
|
Marion Muszynski
|
c17728cdfe
|
Merge branch 'ticket-12563-TrustedBadge'
|
2017-02-27 16:46:39 +01:00 |
|
Marion Muszynski
|
43eb7d308d
|
add observe for new added element
|
2017-02-27 16:45:02 +01:00 |
|
Marion Muszynski
|
f8333322d0
|
fix width of badge
|
2017-02-27 15:48:34 +01:00 |
|
Marion Muszynski
|
1613aa288f
|
fix margin
|
2017-02-27 13:20:46 +01:00 |
|
Marion Muszynski
|
dcb5543f5a
|
Merge branch 'ticket-12658-fixBug'
|
2017-02-27 11:19:13 +01:00 |
|
Marion Muszynski
|
54b5d4b4ba
|
remove var dump
|
2017-02-27 11:15:59 +01:00 |
|
Marion Muszynski
|
61d71ff5ae
|
fix customs process
|
2017-02-27 11:15:12 +01:00 |
|
Marion Muszynski
|
108e87e6eb
|
fix bug custom update
|
2017-02-27 11:01:21 +01:00 |
|
Marion Muszynski
|
456c33e769
|
fix badge to have comment
|
2017-02-24 18:07:55 +01:00 |
|
Marion Muszynski
|
90a8112c07
|
fix js
|
2017-02-24 17:34:30 +01:00 |
|
Marion Muszynski
|
1abc53a6e3
|
add bagde on left column
|
2017-02-24 17:28:19 +01:00 |
|
Marion Muszynski
|
a0b794df37
|
fix conflicts
|
2017-02-24 16:18:45 +01:00 |
|
Marion Muszynski
|
d7f3512dc5
|
fix conflicts
|
2017-02-24 16:12:51 +01:00 |
|
Marion Muszynski
|
1392d4f75c
|
fix size label
|
2017-02-24 16:10:23 +01:00 |
|
Marion Muszynski
|
8ffa5cfd12
|
Merge branch 'ticket-12643-ExportLoyalty'
|
2017-02-24 16:01:56 +01:00 |
|
Marion Muszynski
|
f56c80a0ae
|
add of new menu for export of loyalties
|
2017-02-24 16:01:38 +01:00 |
|