1601 Commits

Author SHA1 Message Date
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
Marion Muszynski
f124cf0241 Merge branch 'ticket-12391-DiscountForNoneOrder_part2' 2017-02-24 14:22:26 +01:00
Marion Muszynski
4cef238c28 modification of discount value 2017-02-24 14:22:10 +01:00
Marion Muszynski
5b5e1933c4 changement position of badge 2017-02-24 14:20:53 +01:00
Marion Muszynski
71fbbda640 Merge branch 'ticket-12571-randomProduct' 2017-02-23 15:37:21 +01:00
Marion Muszynski
c4edb90c2b fix js tooltips in product-list 2017-02-23 15:37:06 +01:00
Marion Muszynski
349eb7cbe4 Merge branch 'ticket-12571-randomProduct' 2017-02-23 15:22:01 +01:00
Marion Muszynski
3f23070f12 fix css tooltip 2017-02-23 15:21:42 +01:00
Marion Muszynski
21a1230a66 Merge branch 'ticket-12391-DiscountForNoneOrder_part2' 2017-02-23 13:33:28 +01:00
Marion Muszynski
43ac843d88 fix date for export to limit result rows 2017-02-23 13:32:42 +01:00
Marion Muszynski
b90eccce14 Merge branch 'ticket-12391-DiscountForNoneOrder_part2' 2017-02-23 13:00:02 +01:00
Marion Muszynski
4ebf0aece0 fix export 2017-02-23 12:59:16 +01:00
Marion Muszynski
f5ad2c5920 Merge branch 'ticket-12391-DiscountForNoneOrder_part2' 2017-02-23 12:47:48 +01:00
Marion Muszynski
47baf3e7dd addition of export for analysis 2017-02-23 12:45:38 +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
055f7b5ba0 update style bulkupdate 2017-02-21 18:03:12 +01:00
Marion Muszynski
17633b00f8 add picto in categoryscroll 2017-02-21 11:57:07 +01:00
Marion Muszynski
2837aea4a5 addition of picto for random product 2017-02-21 11:49:55 +01:00
Marion Muszynski
cf49b2e2b5 Merge branch 'ticket-12391-DiscountForNoneOrder' 2017-02-20 12:59:52 +01:00
Marion Muszynski
a4dc930c88 addition of cron for new customer discounts 2017-02-20 12:58:40 +01:00
Marion Muszynski
bcf44b4e77 fix label size 2017-02-17 15:23:58 +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
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
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
de7b739dbb fix tsid es 2017-02-17 10:55:46 +01:00
Marion Muszynski
b64a84b5e7 fix when no order in one of country 2017-02-17 10:35:25 +01:00