Merge master into release #1920

Merged
neb-b merged 19 commits from master into release-0.25.0 2018-08-29 02:29:56 +02:00

19 commits

Author SHA1 Message Date
Sean Yesmunt
72549f86c8
Merge branch 'release-0.25.0' into master 2018-08-28 20:29:46 -04:00
Sean Yesmunt
ccd5f4c7ce
Merge pull request #1917 from ykris45/patch-1
added learn more faq to wallet security section
2018-08-28 20:25:22 -04:00
Sean Yesmunt
9c1d4c4af5
Merge branch 'master' into patch-1 2018-08-28 20:06:37 -04:00
Sean Yesmunt
edf8cd65e5 update formatting 2018-08-28 20:05:14 -04:00
Thomas Zarebczan
33d1c3f89b
Merge pull request #1918 from lbryio/issue-1812
fetch new rewards and properly call reward claim after view event has been fired
2018-08-28 16:54:22 -07:00
Sean Yesmunt
d04f43d4ac
Merge pull request #1919 from lbryio/subscription-claim-list
Fix calling claim_list with wrong params
2018-08-28 17:59:50 -04:00
Sean Yesmunt
6091bdec18 remove old reward call 2018-08-28 17:54:23 -04:00
Sean Yesmunt
82f2d24dd3 change name to fetchRewardedContent 2018-08-28 17:53:20 -04:00
Sean Yesmunt
f51ba5c615 fix typo 2018-08-28 17:20:11 -04:00
YULIUS KURNIAWAN KRISTIANTO
6f91908005
Update view.jsx 2018-08-29 04:15:29 +07:00
Sean Yesmunt
649c28dad6 bump lbry-redux 2018-08-28 17:14:52 -04:00
Sean Yesmunt
5cc5f60b82
Merge pull request #1914 from lbryio/related-spinner
add spinner to related content
2018-08-28 17:13:41 -04:00
Sean Yesmunt
387a277322 typo 2018-08-28 16:51:50 -04:00
Sean Yesmunt
de631ac039 fetch new rewards and properly call reward claim after view event has been fired 2018-08-28 16:46:50 -04:00
YULIUS KURNIAWAN KRISTIANTO
afa8c1627e
Update CHANGELOG.md 2018-08-29 03:26:27 +07:00
YULIUS KURNIAWAN KRISTIANTO
75fadb8a1d
added learn more faq to wallet security section 2018-08-29 03:23:09 +07:00
Sean Yesmunt
52f3fab3a6 add spinner to related content 2018-08-28 11:35:24 -04:00
Sean Yesmunt
2038a49256
Merge pull request #1912 from lbryio/fix-subscription-notification
don't show notification for new subscription if on subscription page
2018-08-28 11:33:54 -04:00
Sean Yesmunt
a57c207e60 don't show notification for new subscription if on subscription page 2018-08-28 00:19:26 -04:00