Commit graph

2376 commits

Author SHA1 Message Date
Shawn K e606b127c0
Merge pull request #810 from lbryio/master
Cut staging from master
2018-12-04 13:01:24 -06:00
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
Shawn K 28699f0992
Merge pull request #803 from lbryio/master
Cut staging from master
2018-12-03 15:58:50 -06:00
Shawn K af24a11ca2
Merge pull request #801 from jessopb/AssetInfo
adds LBRY and Permanent URLS to info component
2018-12-03 15:58:14 -06:00
Shawn K dab56b47d1
Merge pull request #802 from lbryio/fix-custom-css
Fix SCSS overrides for site/custom
2018-12-03 15:37:02 -06:00
Shawn 7288b1f541 Fix SCSS overrides for site/custom 2018-12-03 15:32:57 -06:00
jessop 267db2d614 adds LBRY and Permanent URLS to info component 2018-12-03 12:58:00 -05:00
Shawn K 6286a61274
Merge pull request #799 from lbryio/master
Cut staging from master
2018-12-01 01:36:24 -06:00
Shawn K c1b5d521b9
Merge pull request #798 from lbryio/memeify-fixes
Attempt to fix Safari rendering of SVGs
2018-12-01 01:35:59 -06:00
Shawn ade68b217c Attempt to fix Safari rendering of SVGs 2018-12-01 01:34:45 -06:00
Shawn K d5191215b4
Merge pull request #797 from lbryio/master
Cut staging from master
2018-12-01 01:26:20 -06:00
Shawn K 27ccbb5f14
Merge pull request #796 from lbryio/memeify-fixes
Memeify fixes
2018-12-01 01:25:47 -06:00
Shawn b5c8cbec52 Attempt to fix Safari rendering of SVGs 2018-12-01 01:23:22 -06:00
Shawn 753935f284 Add Outline font, UI adjustments 2018-11-30 14:18:42 -06:00
Jeremy Kauffman 506eac507f
proposed readme changes 2018-11-30 11:26:58 -05:00
Shawn K 7ddb403f6e
Merge pull request #792 from lbryio/master
Cut staging from master
2018-11-30 10:10:00 -06:00
Shawn K 41de5350b7
Merge pull request #747 from jessopb/sensitiveKeys
moves sensitive keys to gitignored folder
2018-11-30 09:45:45 -06:00
Shawn K 26c33cef38
Merge pull request #790 from lbryio/master
Cut staging
2018-11-30 02:15:34 -06:00
Shawn K 85cde161de
Merge pull request #789 from lbryio/featureTesting
Attempt to fix Facebook's browser file picker
2018-11-30 02:14:59 -06:00
Shawn 98a6ae44c5 Attempt to fix Facebook's browser file picker 2018-11-30 02:13:52 -06:00
Shawn K 62cf5aefed
Merge pull request #787 from lbryio/master
Cut staging from master
2018-11-30 01:54:43 -06:00
Shawn K 2153fe1fec
Merge pull request #786 from lbryio/featureTesting
Attempt to fix Facebook's browser file picker
2018-11-30 01:54:18 -06:00
Shawn 145db6a290 Attempt to fix Facebook's browser file picker 2018-11-30 01:52:33 -06:00
Shawn K 18ea0a0df5
Merge pull request #784 from lbryio/master
Cut staging from master
2018-11-30 01:39:34 -06:00
Shawn K 65610a9414
Merge pull request #783 from lbryio/featureTesting
Attempt to fix Facebook's browser file picker
2018-11-30 01:39:05 -06:00
Shawn 4efb8ebc33 Attempt to fix Facebook's browser file picker 2018-11-30 01:35:46 -06:00
Shawn K b1261ae59b
Merge pull request #772 from lbryio/master
Cut staging from master
2018-11-29 20:55:35 -06:00
Shawn K b529b6a0e0
Merge pull request #748 from lbryio/featureTesting
Add initial meme generator!
2018-11-29 20:54:55 -06:00
Shawn 7b53cf48ec Font tweaks and add Neon font 2018-11-29 20:54:24 -06:00
Shawn K e265052d4a
Merge pull request #770 from jessopb/fix741
ensures that getClaimIdByLongChannelId tests for bidstate
2018-11-29 20:28:07 -06:00
Shawn K 251b4a8d4a
Merge pull request #771 from jessopb/previewplay
makes play overlay more like (firefox) browser
2018-11-29 20:27:05 -06:00
Shawn adfcbfdbea Add fonts (Lazer, Green Machine, Inferno), fix fiont previews, add save message 2018-11-29 20:25:49 -06:00
jessop 1531476659 makes play overlay more like (firefox) browser 2018-11-29 18:00:00 -05:00
jessop 0a65906130 ensures that getClaimIdByLongChannelId tests for bidstate 2018-11-29 17:01:01 -05:00
Shawn K b8cce1bc69
Merge pull request #765 from jessopb/chainsort
standardizes channelClaimsArray order to match lbryumx sorting
2018-11-28 20:50:54 -06:00
Shawn K 40a8c04daa
Merge pull request #767 from lbryio/master
Cut staging from master
2018-11-27 23:30:38 -06:00