update changelog test #1994

Closed
Ricardojc2017 wants to merge 96 commits from master into 25-patch-file-view

96 commits

Author SHA1 Message Date
Sean Yesmunt
5619a4a030
Merge pull request #1993 from lbryio/reward-codes
move reward code to bottom of rewards list
2018-10-02 11:37:19 -04:00
Sean Yesmunt
5fad830618 move reward code to bottom of rewards list 2018-10-02 11:11:48 -04:00
Sean Yesmunt
3357d14d9c
Merge pull request #1935 from lbryio/reward-codes
Add reward code redemption
2018-10-01 21:11:04 -04:00
Sean Yesmunt
30ba7ba773 update labels and use latest lbryinc 2018-10-01 20:55:03 -04:00
Sean Yesmunt
3ad01eec17
Merge pull request #1991 from lbryio/react-key
update key for FileList
2018-10-01 17:27:44 -04:00
Sean Yesmunt
abad9be552 update key for FileList 2018-10-01 16:11:30 -04:00
Sean Yesmunt
0b07ff61cf
Merge pull request #1940 from lbryio/publish-overtake-amounts
Better messaging for takeover amounts on publish page
2018-10-01 14:59:49 -04:00
Sean Yesmunt
d7e4ca6e10 add additional helper to bid help text 2018-10-01 14:59:20 -04:00
Sean Yesmunt
4522346f4d
Merge pull request #1985 from ykris45/patch-2
Update _card.scss
2018-09-30 22:45:31 -04:00
Thomas Zarebczan
87da2dda85
fix spelling 2018-09-30 20:35:54 -04:00
Sean Yesmunt
d2cbaf5506 update changelog 2018-09-27 17:49:06 -04:00
Sean Yesmunt
133829617d remove position: 'releative' from .card css class 2018-09-27 17:48:01 -04:00
Sean Yesmunt
caa5abfdfd ensure modals have consistent styling 2018-09-26 13:48:07 -04:00
Sean Yesmunt
f14d2c6859
Merge pull request #1980 from lbryio/title
Add proper html title to card/tile components for long titles
2018-09-26 13:37:47 -04:00
Sean Yesmunt
49573a65b9 add logic for reward codes 2018-09-25 20:13:49 -04:00
Sean Yesmunt
a0d122afc5
Merge pull request #1979 from lbryio/tooltip
Smart tooltip
2018-09-24 20:43:07 -04:00
Sean Yesmunt
516a3f52e8 improve bid/name help text 2018-09-24 20:17:08 -04:00
Sean Yesmunt
65afbb85d6
Merge pull request #1981 from jessopb/shareUpdate
hotfix: share is broken; use currently working spee.ch share url
2018-09-24 19:18:13 -04:00
btzr-io
a028420dc4 add comment 2018-09-24 17:08:41 -06:00
Sean Yesmunt
f3e4f2bf70 add title prop to UriIndicator 2018-09-24 19:08:24 -04:00
Sean Yesmunt
009a3ecb8d update lbry-redux 2018-09-24 18:07:15 -04:00
Jessop Breth
4310deecb1 fix: adds channelClaimId to channelName speech URL 2018-09-24 12:42:49 -04:00
Sean Yesmunt
b054bc096e
Merge pull request #1937 from lbryio/lbryinc
Use lbryio/lbryinc
2018-09-24 09:32:44 -04:00
btzr-io
3d8f612ca0 update changelog 2018-09-23 22:28:08 -06:00
Sean Yesmunt
9b700e48bf use lbryio/lbryinc 2018-09-23 23:44:42 -04:00
btzr-io
9ce626cd6e fix tooltip styles 2018-09-23 16:10:29 -06:00
btzr-io
d6cfc8d5fc make tooltip smarter 2018-09-23 16:01:12 -06:00
Sean Yesmunt
b972064f1c
Merge pull request #1977 from lbryio/auto-focus
AutoFocus form-fields
2018-09-21 22:30:11 -04:00
btzr-io
b1549de61c update changelog 2018-09-21 19:39:24 -06:00
btzr-io
fcbe52cdea auto focus modal form-fields 2018-09-21 19:20:58 -06:00
Sean Yesmunt
e91b4d9ca8
Merge pull request #1964 from jessopb/tiplogic
refactors and enhances tip modal
2018-09-19 20:29:11 -04:00
Jessop Breth
85163ad2aa refactors and enhances tip modal 2018-09-19 18:29:11 -04:00
Sean Yesmunt
8502fef2b9
Merge pull request #1972 from lbryio/fileCard
remove position icon from FileCard
2018-09-19 13:34:34 -04:00
Sean Yesmunt
8eade58dd5 remove position icon from FileCard 2018-09-19 11:57:38 -04:00
Sean Yesmunt
f6dc02403a fix typo 2018-09-19 11:55:14 -04:00
Sean Yesmunt
4a461e83d1
Merge pull request #1973 from lbryio/release.0.25.1
Merge release back into master
2018-09-18 19:07:36 -04:00
Sean Yesmunt
32ae269f34 v0.25.1 2018-09-18 18:52:17 -04:00
Sean Yesmunt
2f42a57e21 0.25.1-rc.2 2018-09-18 18:51:56 -04:00
Sean Yesmunt
267411f30e remove special characters from travis ENVs 2018-09-18 18:51:56 -04:00
Sean Yesmunt
2247822592 Merge pull request #1934 from lbryio/travis-changes
Travis env vars
2018-09-18 18:50:58 -04:00
Sean Yesmunt
ded2df89dc 0.25.1-rc.1 2018-09-18 18:50:24 -04:00
Sean Yesmunt
d758de0e67 update changelog 2018-09-18 18:50:24 -04:00
Sean Yesmunt
d0c2490202 fix: ensure file_view events for autoplay/subscriptions 2018-09-18 18:50:24 -04:00
Thomas Zarebczan
451ebed12e changelog update 2018-09-18 18:50:24 -04:00
ポール ウェッブ
35fc384a59 Updated gitignore 2018-09-18 16:13:55 -05:00
Sean Yesmunt
226827e08c
Merge pull request #1970 from lbryio/travis-env-fix
remove special characters from travis ENVs
2018-09-17 14:55:05 -04:00
Sean Yesmunt
e26705f6e2 remove special characters from travis ENVs 2018-09-17 14:37:51 -04:00
Sean Yesmunt
1cd95f0286
Merge pull request #1943 from jessopb/modals
feature: ModalSocialShare
2018-09-13 15:43:29 -04:00
Jessop Breth
8010c4b292 adds modal socialshare capability 2018-09-12 12:54:35 -04:00
Sean Yesmunt
923fac18d2
Merge pull request #1947 from jessopb/fixTipModal
fix: checks tip input re:#1889
2018-09-12 11:21:07 -04:00
Jessop Breth
bbd785e161 checks tip input 2018-09-08 18:11:32 -04:00
Sean Yesmunt
bd046a48b6
Merge pull request #1946 from lbryio/default-path
set default path back to discover
2018-09-08 12:45:17 -04:00
Sean Yesmunt
db0b77504d set default path back to discover 2018-09-08 12:44:15 -04:00
Sean Yesmunt
1eb593e2b4
Merge pull request #1944 from jessopb/fixTipModal
fix: modalSendTip now closes on esc/click outside
2018-09-07 14:22:45 -04:00
Jessop Breth
780ef26e9b modalSendTip closes on esc/click outside 2018-09-07 14:10:46 -04:00
Sean Yesmunt
9a716ea5be
Merge pull request #1942 from lbryio/t-patch
Fix table elements padding and spacing
2018-09-07 10:14:18 -04:00
Sean Yesmunt
fcb08f8344 update changelog 2018-09-07 10:13:30 -04:00
btzr-io
61a2131878 revert top-bottom padding 2018-09-07 10:12:46 -04:00
btzr-io
f34371a955 fix table padding 2018-09-07 10:12:46 -04:00
Sean Yesmunt
dc460c4cb1
Merge pull request #1941 from lbryio/pg-patch
Fix pagination spacing and align issues
2018-09-07 10:07:03 -04:00
Sean Yesmunt
2e9897a558 update changelog 2018-09-07 10:06:38 -04:00
btzr-io
01380c9466 align page-number input with pagination component on channel page 2018-09-07 10:05:49 -04:00
Sean Yesmunt
27ef62d3df
Merge pull request #1939 from lbryio/md-patch
Fix paragraphs spacing on markdown render
2018-09-07 09:56:15 -04:00
Sean Yesmunt
582ad19b6e update changelog 2018-09-07 09:55:37 -04:00
Sean Yesmunt
83d5c076e4
Merge pull request #1846 from lbryio/user-history
User history
2018-09-07 01:21:37 -04:00
btzr-io
83da37f09c reduce margin size 2018-09-06 19:01:58 -06:00
btzr-io
f6667de9e0 add vertical spacing for markdown paragraphs 2018-09-06 18:55:57 -06:00
Sean Yesmunt
32debe1af6
Merge pull request #1934 from lbryio/travis-changes
Travis env vars
2018-09-05 21:00:52 -04:00
Sean Yesmunt
151d78f1c0
Merge branch 'master' into user-history 2018-09-04 13:28:51 -04:00
Sean Yesmunt
4064b8c064 bring selectNavLinks back into lbry-redux 2018-09-04 13:23:18 -04:00
Sean Yesmunt
4108e7fdcf fix select/unselect 2018-09-04 13:18:11 -04:00
Shawn K
b77864230d
Merge pull request #1930 from lbryio/thumbnail-fix
fix: inconsistent thumbnail size on the publish page
2018-09-02 19:09:51 -05:00
Shawn K
9df88a5df5
Merge pull request #1929 from lbryio/email-management
add email management link next to email
2018-09-02 19:09:29 -05:00
Sean Yesmunt
bd26d422fb fix: inconsistent thumbnail size on the publish page 2018-09-01 21:49:12 -04:00
Sean Yesmunt
cd010b97c4 add email management link 2018-09-01 20:05:28 -04:00
Niko Storni
3060942f88
don't pass commit messages
add missing env var
2018-08-31 11:32:54 -04:00
Niko Storni
5f31e78b6b
add encrypted env vars
let travis format .travis.yml
2018-08-31 10:47:45 -04:00
Sean Yesmunt
a782f817f1 style history table 2018-08-30 23:45:49 -04:00
Sean Yesmunt
fb3097a739
Merge pull request #1925 from lbryio/color-fix
change channel link color to be consistent with internal links
2018-08-30 13:10:24 -04:00
Sean Yesmunt
d01b893a68 add UserHistory component 2018-08-30 01:11:05 -04:00
Sean Yesmunt
625a9177ee add back stuff I shouldn't have deleted 2018-08-29 23:35:49 -04:00
Sean Yesmunt
fab8e47801 rebase 2018-08-29 23:28:53 -04:00
Travis Eden
00c488799f add delete icons to <FileCard> 2018-08-29 23:19:54 -04:00
Travis Eden
245f5929c8 fix type error 2018-08-29 23:18:51 -04:00
Travis Eden
9bd0a32b99 add lastViewed prop to <FileCard> 2018-08-29 23:18:51 -04:00
Travis Eden
86a40eacbc add UserHistoryPage 2018-08-29 23:17:20 -04:00
Travis Eden
5cd7794fa0 record browsing history, persist content 2018-08-29 23:17:20 -04:00
Travis Eden
58ed68d8c3 position tracking clean up 2018-08-29 23:16:59 -04:00
Travis Eden
287f1ac656 add refresh icon to <FileCard> when playback position exists 2018-08-29 23:16:58 -04:00
Travis Eden
82252e6985 remove media.paused; catch file open pause from change of content.playingUri 2018-08-29 23:16:06 -04:00
Travis Eden
f1a799374a media.positions[outpoint] |> content.positions[claimId][outpoint] 2018-08-29 23:15:43 -04:00
Travis Eden
503bc76ef1 remove unused state.content.currentlyIsPlaying 2018-08-29 23:14:34 -04:00
Sean Yesmunt
b5232ae6c6 change channel link color to be consistent with internal links 2018-08-29 15:44:02 -04:00
Sean Yesmunt
7af6a8820c update changelog 2018-08-29 15:32:09 -04:00
Sean Yesmunt
70854d19f0
Merge pull request #1924 from lbryio/release-0.25.0
Merge 'release' into master
2018-08-29 15:29:32 -04:00
Thomas Zarebczan
b245655371
cleanup 2018-08-29 15:02:25 -04:00