Marion Muszynski
|
3f3b5a0023
|
modif include to require
|
2017-07-18 10:38:23 +02:00 |
|
Marion Muszynski
|
bcbab8adbb
|
Merge branch 'ticket-13351-EdTag'
|
2017-07-18 10:36:19 +02:00 |
|
Marion Muszynski
|
66d37d34c6
|
Merge branch 'ticket-13351-EdTag' into develop
|
2017-07-18 10:28:27 +02:00 |
|
Marion Muszynski
|
0bd93ed4b2
|
add module tracking tag
|
2017-07-18 10:28:05 +02:00 |
|
Marion Muszynski
|
ffd3b8adc4
|
Merge branch 'ticket-13351-EdTag' into develop
|
2017-07-18 10:27:34 +02:00 |
|
Marion Muszynski
|
42bca45df3
|
Merge branch 'ticket-13564-giftOnShoppingCart' into develop
|
2017-07-18 10:18:50 +02:00 |
|
Marion Muszynski
|
0e5cbb2638
|
fix cart
|
2017-07-18 10:18:38 +02:00 |
|
Marion Muszynski
|
e20992d824
|
Merge branch 'ticket-13564-giftOnShoppingCart' into develop
|
2017-07-18 10:07:13 +02:00 |
|
Marion Muszynski
|
1084d47e72
|
fix validate gift message
|
2017-07-18 10:06:57 +02:00 |
|
Marion Muszynski
|
d868d563f5
|
start of tracking tag
|
2017-07-18 09:56:24 +02:00 |
|
Marion Muszynski
|
ab2858cb9a
|
Merge branch 'ticket-13679-AntCustomGroup'
|
2017-07-17 11:01:15 +02:00 |
|
Marion Muszynski
|
3e8e564e4e
|
Merge branch 'ticket-12743-SavSupplier' into develop
|
2017-07-13 17:00:18 +02:00 |
|
Marion Muszynski
|
0479310097
|
add quantity info
|
2017-07-13 17:00:02 +02:00 |
|
Marion Muszynski
|
d7552c5d21
|
Merge branch 'ticket-12743-SavSupplier' into develop
|
2017-07-13 16:46:26 +02:00 |
|
Marion Muszynski
|
4589c86bb5
|
add module ant supplier demand
|
2017-07-13 16:46:11 +02:00 |
|
Marion Muszynski
|
1ce931d256
|
Merge branch 'ticket-13679-AntCustomGroup' into develop
|
2017-07-12 17:14:49 +02:00 |
|
Marion Muszynski
|
adf8bc8185
|
add module custom group
|
2017-07-12 17:14:30 +02:00 |
|
Marion Muszynski
|
655b0e4236
|
Merge branch 'ticket-10648-fileUploadOnMobile'
|
2017-07-11 16:31:11 +02:00 |
|
Marion Muszynski
|
ae39024da4
|
fix conflicts
|
2017-07-11 16:21:20 +02:00 |
|
Marion Muszynski
|
e2533c3033
|
add file upload on mobile contact form
|
2017-07-11 16:19:20 +02:00 |
|
Marion Muszynski
|
c94d2c4431
|
fix conflicts
|
2017-07-11 10:04:00 +02:00 |
|
Marion Muszynski
|
3a2438d01d
|
Merge branch 'ticket-trustedBadge'
|
2017-07-10 15:55:40 +02:00 |
|
Marion Muszynski
|
86eafbb1f8
|
Merge branch 'ticket-trustedBadge' into develop
|
2017-07-10 15:55:01 +02:00 |
|
Marion Muszynski
|
ac862f6d92
|
fix trusted badge
|
2017-07-10 15:54:46 +02:00 |
|
Marion Muszynski
|
0ac95d23a5
|
Merge branch 'ticket-13695-BugBraderie'
|
2017-07-10 15:29:57 +02:00 |
|
Marion Muszynski
|
68d240d7ae
|
Merge branch 'ticket-trustedBadge' into develop
|
2017-07-10 15:04:58 +02:00 |
|
Marion Muszynski
|
ea25a41e2e
|
Merge branch 'ticket-trustedBadge'
|
2017-07-10 15:04:05 +02:00 |
|
Marion Muszynski
|
3869781a1f
|
remove trusted badge on mobile
|
2017-07-10 15:03:49 +02:00 |
|
Marion Muszynski
|
362031dc35
|
Merge branch 'ticket-13695-BugBraderie' into develop
|
2017-07-10 14:11:50 +02:00 |
|
Marion Muszynski
|
deef10a0b2
|
update and fix braderie
|
2017-07-10 14:11:35 +02:00 |
|
Marion Muszynski
|
ee1f66436c
|
Merge branch 'ticket-11985-MRDeliveryAddress'
|
2017-07-07 12:39:00 +02:00 |
|
Marion Muszynski
|
827aac76dc
|
Merge branch 'ticket-11985-MRDeliveryAddress' into develop
|
2017-07-07 12:38:40 +02:00 |
|
Marion Muszynski
|
55d3cd475f
|
add posibility to change mr address
|
2017-07-07 12:38:21 +02:00 |
|
Marion Muszynski
|
84d7e1f715
|
Merge branch 'ticket-11985-MRDeliveryAddress'
|
2017-07-07 12:15:35 +02:00 |
|
Marion Muszynski
|
dfe25a8005
|
show mr delivery address on invoice pdf
|
2017-07-07 12:15:20 +02:00 |
|
Marion Muszynski
|
71936e370d
|
Merge branch 'ticket-13661-mobileReturn'
|
2017-07-07 11:05:33 +02:00 |
|
Marion Muszynski
|
05c988412b
|
Merge branch 'ticket-13661-mobileReturn' into develop
|
2017-07-07 11:04:07 +02:00 |
|
Marion Muszynski
|
d775d69d33
|
fix mobile back from product
|
2017-07-07 11:03:51 +02:00 |
|
Marion Muszynski
|
441b94f1d8
|
Merge branch 'ticket-13564-giftOnShoppingCart' into develop
|
2017-07-06 17:50:23 +02:00 |
|
Marion Muszynski
|
dee10d158c
|
fix alert
|
2017-07-06 17:50:10 +02:00 |
|
Marion Muszynski
|
323e859e3f
|
Merge branch 'ticket-13564-giftOnShoppingCart' into develop
|
2017-07-06 17:30:30 +02:00 |
|
Marion Muszynski
|
92b2366ed1
|
fix
|
2017-07-06 17:30:16 +02:00 |
|
Marion Muszynski
|
04ceecce9f
|
Merge branch 'ticket-13521-ExtractProducts'
|
2017-07-06 16:42:54 +02:00 |
|
Marion Muszynski
|
471b9a77e7
|
add link to download product base
|
2017-07-06 16:42:39 +02:00 |
|
Marion Muszynski
|
389ba5467a
|
Merge branch 'ticket-13564-giftOnShoppingCart' into develop
|
2017-07-05 13:16:13 +02:00 |
|
Marion Muszynski
|
5670e21fa3
|
continuation of moving message gift to shipping cart
|
2017-07-05 13:15:51 +02:00 |
|
Marion Muszynski
|
fd18fd3421
|
Merge branch 'ticket11985-invoiceMR'
|
2017-07-05 12:19:31 +02:00 |
|
Marion Muszynski
|
c4193b7119
|
hide error message after 4s
|
2017-07-05 12:19:14 +02:00 |
|
Marion Muszynski
|
4df600b0cc
|
add error message
|
2017-07-05 12:13:40 +02:00 |
|
Marion Muszynski
|
e01ae068ca
|
Merge branch 'ticket-13508-HMAC' into develop
|
2017-07-05 11:25:04 +02:00 |
|