Cut staging from master #810

Merged
skhameneh merged 16 commits from master into staging 2018-12-04 20:01:25 +01:00

16 commits

Author SHA1 Message Date
Shawn K
f790ae19de
Merge pull request #722 from lbryio/pending-claims
handle pending claims
2018-12-04 12:27:48 -06:00
Shawn
d089554fe4 Add unsaved resolved file conflicts 2018-12-04 12:22:26 -06:00
Travis Eden
d05cf1e71e hide pending images on channel page 2018-12-04 12:20:15 -06:00
Travis Eden
cdbd5eee80 add pending marker 2018-12-04 12:20:11 -06:00
Travis Eden
b49cb4484c mark pending claims; move them to front of list; show proper notification 2018-12-04 12:17:00 -06:00
Shawn K
e78ef17cca
Merge pull request #807 from jessopb/lbryurlbug
fixes bug in lbryurl copy
2018-12-04 12:14:27 -06:00
Shawn K
d8e13cbfcf
Update view.jsx 2018-12-04 12:14:15 -06:00
Shawn K
471930e0c3
Merge pull request #805 from jessopb/moreBidState
checks bidstate on top-free claimnames
2018-12-04 12:13:00 -06:00
Shawn K
defc96b80b
Merge pull request #806 from lbryio/increase-file-delay
Increase file wait delay
2018-12-04 12:12:22 -06:00
jessop
9c0e0b789e fixes bug in lbryurl copy 2018-12-04 13:11:24 -05:00
Shawn
3c6b378611 Increase file wait delay 2018-12-04 12:11:14 -06:00
jessop
204686b690 checks bidstate on top-free claimnames 2018-12-04 12:43:37 -05:00
Jeremy Kauffman
959c06746d
Update README.md 2018-12-04 11:38:48 -05:00
Jeremy Kauffman
e12eb2cca7
Merge pull request #794 from lbryio/readme-tweaks
proposed readme changes
2018-12-04 11:36:11 -05:00
Jeremy Kauffman
82c6b966e4
Update README.md 2018-12-04 11:35:59 -05:00
Jeremy Kauffman
506eac507f
proposed readme changes 2018-11-30 11:26:58 -05:00