Commit graph

986 commits

Author SHA1 Message Date
Shawn Khameneh
f73bc22c11 Sync bundle 2018-07-18 14:15:33 -04:00
Shawn Khameneh
acbb4d247b Make adjustments 2018-07-18 14:10:32 -04:00
Shawn Khameneh
188ff62724 Merge remote-tracking branch 'origin/master' into redux-encryption-flow 2018-07-18 14:09:52 -04:00
Sean Yesmunt
52a0143eba
Merge pull request #58 from lbryio/transaction-type-constants
define transaction type constants
2018-07-18 09:08:32 -04:00
Shawn Khameneh
378f0513bf Add encryption flow to redux 2018-07-17 22:55:40 -04:00
Travis Eden
7883c92704 define transaction type constants 2018-07-17 13:00:04 -04:00
Travis Eden
334f276795 add error handling for file info 2018-07-13 12:14:26 -04:00
Thomas Zarebczan
177ef2c191
lbry-app > lbry-desktop 2018-07-12 16:42:08 -04:00
Thomas Zarebczan
7b11610294
lbry-app > lbry-desktop 2018-07-12 16:14:43 -04:00
Sean Yesmunt
818af46ab0
Merge pull request #52 from lbryio/abandon-filter
label abandon(ed) claims
2018-07-11 22:50:42 -04:00
Sean Yesmunt
9130f54ce4
Merge pull request #53 from lbryio/select-nsfw
Select nsfw content
2018-07-11 22:38:42 -04:00
Sean Yesmunt
711806d1a4
Merge pull request #55 from lbryio/revert-54-regtest-regex
Revert "add support for regtest address validation"
2018-07-11 00:38:44 -04:00
Sean Yesmunt
efc2b9b164
Revert "add support for regtest address validation" 2018-07-11 00:38:32 -04:00
Sean Yesmunt
a0d2d1ac53
Merge pull request #54 from lbryio/regtest-regex
add support for regtest address validation
2018-07-11 00:18:37 -04:00
Sean Yesmunt
1509a07fa2 add support for regtest address validation 2018-07-11 00:17:29 -04:00
Sean Yesmunt
f466a5aa7f add selectors for nsfw claim count 2018-07-10 19:15:39 -04:00
Travis Eden
e33302dc83 label abandoned claims 2018-07-10 18:05:43 -04:00
Sean Yesmunt
341db02c09 update build 2018-07-09 00:56:32 -04:00
Sean Yesmunt
189b11ac50
Merge pull request #51 from btzr-io/patch-1
Fix getMediaType logic
2018-07-09 00:55:48 -04:00
Baltazar Gomez
6a21ea7d72
use file extension for media detection 2018-07-05 12:20:41 -06:00
Baltazar Gomez
6eba5f8823
update lbry.getMediaType function logic 2018-07-04 17:06:13 -06:00
Sean Yesmunt
201d78b68a
Merge pull request #50 from lbryio/tip-msg
update tip message
2018-06-19 14:18:16 -04:00
Sean Yesmunt
2743c88457 update build 2018-06-19 14:17:58 -04:00
Thomas Zarebczan
71bee85361
update tip message 2018-06-19 13:33:16 -04:00
Sean Yesmunt
269e913bba
Merge pull request #49 from lbryio/markb_search
added size and from values for query and as input to dosearch.
2018-06-18 20:11:42 -04:00
Sean Yesmunt
be7a07302a
Merge pull request #48 from Grayyyyy/patch-1
Big typo fix
2018-06-18 12:57:43 -04:00
Sean Yesmunt
160d684652 update build 2018-06-18 12:57:19 -04:00
Mark Beamer Jr
6b6a7021bb added size and from values for query and as input to dosearch. 2018-06-17 22:29:54 -04:00
Graydon
5cf243b28b
Big typo fix
"recieve"
2018-06-16 17:45:41 -05:00
Sean Yesmunt
52ffd4c6bd
Merge pull request #47 from lbryio/speech-statuses
fix typo
2018-06-14 16:22:49 -04:00
Sean Yesmunt
1739929ecf fix typo 2018-06-14 16:22:16 -04:00
Sean Yesmunt
f6f9c9d225
Merge pull request #46 from lbryio/speech-statuses
change name of thumbnail upload statuses
2018-06-14 16:20:06 -04:00
Sean Yesmunt
98a05ae2fb change name of thumbnail statuses 2018-06-14 16:18:35 -04:00
Sean Yesmunt
121ba56f47
Merge pull request #45 from lbryio/build
chore: update build
2018-06-11 14:29:39 -04:00
Sean Yesmunt
83b2a11815 chore: update build 2018-06-11 14:28:56 -04:00
Sean Yesmunt
7759bc6e8c
Merge pull request #43 from lbryio/thumbnail-upload
Thumbnail upload type
2018-06-07 23:37:47 -04:00
Akinwale Ariwodola
543af2fcee
add methods related to fetching trending content (#44) 2018-06-06 01:24:01 +01:00
Sean Yesmunt
888fd5615f update build 2018-06-05 00:13:44 -04:00
Sean Yesmunt
2a3beabe09 add confirm thumbnail modal type 2018-06-05 00:13:06 -04:00
Sean Yesmunt
3bc978ef4e build 2018-06-04 23:17:20 -04:00
Sean Yesmunt
0239589369
Merge pull request #41 from btzr-io/patch-4
Add 3D-file support for getMediaType function
2018-06-04 23:16:43 -04:00
Sean Yesmunt
02e47f922e
Merge pull request #42 from lbryio/search-page
update search query/activity when navigating
2018-06-04 16:37:46 -04:00
Sean Yesmunt
63e96c65cb
Merge pull request #39 from lbryio/thumbnail-upload-statuses
Thumbnail upload statuses
2018-06-04 14:39:29 -04:00
Travis Eden
afca976ff9 handle HISTORY_NAVIGATE based on if url is /search 2018-06-04 11:51:44 -04:00
Travis Eden
5783efbde1 add thumbnail upload statuses 2018-06-04 09:01:14 -04:00
Travis Eden
135543199f remove notification props 2018-06-04 09:01:14 -04:00
Baltazar Gomez
6d78689fa6
add 3D-file support for getMediaType function 2018-06-03 21:25:50 -06:00
Sean Yesmunt
a32e8835c2 update build 2018-06-01 11:18:27 -04:00
Sean Yesmunt
cdcecce6fe
Merge pull request #40 from lbryio/revert-31-search-page
Revert "do not reset search query on HISTORY_NAVIGATE"
2018-06-01 11:17:45 -04:00
Sean Yesmunt
79280fdabf
Revert "do not reset search query on HISTORY_NAVIGATE" 2018-06-01 11:17:25 -04:00