Marion Muszynski
|
77a9057df1
|
Merge branch 'ticket-12379-updateLabelgenerateEan' into develop
|
2017-02-24 16:10:39 +01:00 |
|
Marion Muszynski
|
1392d4f75c
|
fix size label
|
2017-02-24 16:10:23 +01:00 |
|
Marion Muszynski
|
7a0d101e51
|
Merge branch 'ticket-12391-DiscountForNoneOrder_part2' into develop
|
2017-02-23 13:33:04 +01:00 |
|
Marion Muszynski
|
43ac843d88
|
fix date for export to limit result rows
|
2017-02-23 13:32:42 +01:00 |
|
Marion Muszynski
|
f8e4622179
|
Merge branch 'ticket-12391-DiscountForNoneOrder_part2' into develop
|
2017-02-23 12:59:33 +01:00 |
|
Marion Muszynski
|
4ebf0aece0
|
fix export
|
2017-02-23 12:59:16 +01:00 |
|
Marion Muszynski
|
8191e443ff
|
fix conflicts
|
2017-02-23 12:46:49 +01:00 |
|
Marion Muszynski
|
47baf3e7dd
|
addition of export for analysis
|
2017-02-23 12:45:38 +01:00 |
|
Marion Muszynski
|
54f955f882
|
fix conflicts
|
2017-02-22 16:28:25 +01:00 |
|
Marion Muszynski
|
0b3787b14e
|
fix special char in sale export and some css updatings
|
2017-02-22 16:27:11 +01:00 |
|
Marion Muszynski
|
8f965e43ba
|
Merge branch 'ticket-12571-randomProduct'
|
2017-02-22 11:45:53 +01:00 |
|
Marion Muszynski
|
0e1db8cc03
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-02-22 11:42:39 +01:00 |
|
Marion Muszynski
|
3876e9e439
|
adjusting for printing client
|
2017-02-22 11:42:15 +01:00 |
|
Marion Muszynski
|
055f7b5ba0
|
update style bulkupdate
|
2017-02-21 18:03:12 +01:00 |
|
Marion Muszynski
|
c7314febe2
|
Merge branch 'ticket-12462-returnMR' into develop
|
2017-02-21 14:46:33 +01:00 |
|
Marion Muszynski
|
e3da63737c
|
addition of return mail
|
2017-02-21 14:46:14 +01:00 |
|
Marion Muszynski
|
208f2e2476
|
Merge branch 'ticket-12462-returnMR' into develop
|
2017-02-21 14:25:07 +01:00 |
|
Marion Muszynski
|
acb257335d
|
Merge branch 'ticket-12571-randomProduct' into develop
|
2017-02-21 11:57:25 +01:00 |
|
Marion Muszynski
|
17633b00f8
|
add picto in categoryscroll
|
2017-02-21 11:57: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
|
84560c0ea8
|
Merge branch 'ticket-12487-httpToHttps' into develop
|
2017-02-20 14:33:45 +01:00 |
|
Marion Muszynski
|
d44e614c61
|
fix https in sponsor redirection to authentication
|
2017-02-20 14:33:28 +01:00 |
|
Marion Muszynski
|
cf49b2e2b5
|
Merge branch 'ticket-12391-DiscountForNoneOrder'
|
2017-02-20 12:59:52 +01:00 |
|
Marion Muszynski
|
27f059e40f
|
Merge branch 'ticket-12391-DiscountForNoneOrder' into develop
|
2017-02-20 12:59:06 +01:00 |
|
Marion Muszynski
|
a4dc930c88
|
addition of cron for new customer discounts
|
2017-02-20 12:58:40 +01:00 |
|
Marion Muszynski
|
7a8d6e5355
|
Merge branch 'ticket-12379-updateLabelgenerateEan' into develop
|
2017-02-17 15:24:15 +01:00 |
|
Marion Muszynski
|
bcf44b4e77
|
fix label size
|
2017-02-17 15:23:58 +01:00 |
|
Marion Muszynski
|
1bcc5df644
|
Merge branch 'ticket-12563-TrustedBadge' into develop
|
2017-02-17 15:02:18 +01:00 |
|
Marion Muszynski
|
6b93efe4c5
|
addition of trusted badge
|
2017-02-17 15:02:02 +01:00 |
|
Marion Muszynski
|
dfda640f54
|
Merge branch 'ticket-12563-TrustedBadge'
|
2017-02-17 12:59:24 +01:00 |
|
Marion Muszynski
|
0a94b95ab1
|
Merge branch 'ticket-12563-TrustedBadge' into develop
|
2017-02-17 12:58:27 +01:00 |
|
Marion Muszynski
|
efed3b611e
|
fix json to xml response api
|
2017-02-17 12:58:11 +01:00 |
|
Marion Muszynski
|
4a0fded811
|
Merge branch 'ticket-12563-TrustedBadge'
|
2017-02-17 12:25:59 +01:00 |
|
Marion Muszynski
|
2567489a37
|
Merge branch 'ticket-12563-TrustedBadge' into develop
|
2017-02-17 12:24:47 +01:00 |
|
Marion Muszynski
|
ad26bde331
|
addition of rating
|
2017-02-17 12:24:30 +01:00 |
|
Marion Muszynski
|
7ff5979abc
|
Merge branch 'ticket-12562-trustedShopsES'
|
2017-02-17 11:02:41 +01:00 |
|
Marion Muszynski
|
abed9fd454
|
Merge branch 'ticket-12562-trustedShopsES' into develop
|
2017-02-17 10:56:03 +01:00 |
|
Marion Muszynski
|
de7b739dbb
|
fix tsid es
|
2017-02-17 10:55:46 +01:00 |
|
Marion Muszynski
|
0e34c5a5d8
|
Merge branch 'ticket-12562-trustedShopsES' into develop
|
2017-02-17 10:35:42 +01:00 |
|
Marion Muszynski
|
b64a84b5e7
|
fix when no order in one of country
|
2017-02-17 10:35:25 +01:00 |
|
Marion Muszynski
|
9a634c0d74
|
Merge branch 'ticket-12562-trustedShopsES' into develop
|
2017-02-17 10:23:28 +01:00 |
|
Marion Muszynski
|
7ef48d6256
|
implementation of trsutedshop ES
|
2017-02-17 10:23:07 +01:00 |
|
Marion Muszynski
|
bc37b6c906
|
Merge branch 'ticket-12379-updateLabelgenerateEan' into develop
|
2017-02-16 18:04:22 +01:00 |
|
Marion Muszynski
|
4a9082d25f
|
fix size
|
2017-02-16 18:04:08 +01:00 |
|
Marion Muszynski
|
de856a6c7a
|
Merge branch 'ticket-12379-updateLabelgenerateEan' into develop
|
2017-02-16 17:59:52 +01:00 |
|
Marion Muszynski
|
7ee1ef8d6a
|
fix label size
|
2017-02-16 17:59:30 +01:00 |
|
Marion Muszynski
|
b74733c1dd
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-02-15 12:10:20 +01:00 |
|
Marion Muszynski
|
6b59c291b2
|
add test mondial reprint
|
2017-02-15 12:10:01 +01:00 |
|
Marion Muszynski
|
8a61a09988
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-02-15 11:39:15 +01:00 |
|