Commit graph

1945 commits

Author SHA1 Message Date
Jeremy Kauffman
31b7c326cf Merge branch 'master' into should-component-update 2017-06-08 19:37:48 -04:00
Jeremy Kauffman
f21bf287d9 Merge branch 'master' into should-component-update 2017-06-08 19:36:17 -04:00
Jeremy Kauffman
7ea2999bc4 Merge branch '6ea86b96-positive-claim-fee-only' 2017-06-08 19:26:00 -04:00
Jeremy Kauffman
360a3d74c3 min of 0.01, fix parse call 2017-06-08 19:25:42 -04:00
Jeremy Kauffman
29e21f8faf Merge branch 'positive-claim-fee-only' of https://github.com/6ea86b96/lbry-app into 6ea86b96-positive-claim-fee-only 2017-06-08 19:23:54 -04:00
Jeremy Kauffman
a3870d4f7f update changelog 2017-06-08 19:19:21 -04:00
Jeremy Kauffman
4317057268 Merge branch 'seanyesmunt-master' 2017-06-08 19:18:44 -04:00
Jeremy Kauffman
f2cabfb07a minor correction 2017-06-08 19:16:38 -04:00
Jeremy Kauffman
5d5badd567 Merge branch 'master' of https://github.com/seanyesmunt/lbry-app into seanyesmunt-master 2017-06-08 19:07:50 -04:00
Jeremy Kauffman
1a6a69914c changelog and bugfix 2017-06-08 17:19:02 -04:00
Jeremy Kauffman
09ecae7e0d reviewable 2017-06-08 17:15:34 -04:00
6ea86b96
c78465227a
Don't allow negative numbers for access cost and less than 1 for identity 2017-06-08 23:25:34 +07:00
Sean Yesmunt
e13d7c2149 use React.PureComponent 2017-06-07 21:42:19 -07:00
Sean Yesmunt
4c216d843b add whyDidYouUpdate for dev env 2017-06-07 21:41:33 -07:00
Jeremy Kauffman
18a40defba mostly done? 2017-06-07 20:56:52 -04:00
Jeremy Kauffman
cbf35014cd previously uncommitted copy change 2017-06-07 12:11:47 -04:00
Jeremy Kauffman
4f65957287 not enough progress 2017-06-07 12:11:47 -04:00
Jeremy Kauffman
b6881c829c uncommitted work from last night 2017-06-07 12:08:05 -04:00
Jeremy Kauffman
a17d19038e good chunk of progress towards auth and rewards refactor / degating 2017-06-07 12:08:04 -04:00
Sean Yesmunt
11fa00504d switch to BEM naming pattern 2017-06-07 09:06:14 -07:00
6ea86b96
eb170b9720 Working on rewards refactor 2017-06-07 12:04:39 -04:00
Jeremy Kauffman
e0b8afe028 midway through auth rewrite 2017-06-07 11:56:01 -04:00
Jeremy Kauffman
ddd01855b0 slight progress 2017-06-07 11:50:44 -04:00
Jeremy Kauffman
86f9749753 Bump version: 0.12.0rc5 → 0.12.0rc6 2017-06-07 11:09:53 -04:00
Jeremy Kauffman
3ee250a651 Merge pull request #192 from 6ea86b96/claims-by-id
Store claims by claim_id and fileinfo by sd_hash
2017-06-07 11:09:38 -04:00
Jeremy Kauffman
3c58678f62 Merge pull request #207 from filipnyquist/fillerino-ver-fix
Fixed the local version in help
2017-06-07 11:05:01 -04:00
Fillerino
b5218a39e7 Fixed the local version in help
This commit fixes the version in the help page.
Before it displayed the last remote version, now it displays the "localVersion".
2017-06-07 16:51:50 +02:00
Sean Yesmunt
0a7626fe49 remove un-necessary comment 2017-06-07 00:15:55 -07:00
Sean Yesmunt
46862a302e style loading spinner 2017-06-06 23:32:38 -07:00
Sean Yesmunt
708efba091 fix prop name 2017-06-06 22:42:01 -07:00
Sean Yesmunt
7a467f3635 move video-player and video-player-button into their own file 2017-06-06 22:36:12 -07:00
Sean Yesmunt
57a7d1db97 add internal video loading screen component 2017-06-06 21:12:45 -07:00
6ea86b96
626167995a
Ignore .vimrc 2017-06-07 09:12:40 +07:00
6ea86b96
732c9c3bd3 Make channel pages work again 2017-06-07 08:34:43 +07:00
6ea86b96
72137f51d2 Fix resolving uris in file tile 2017-06-07 08:34:13 +07:00
6ea86b96
c023a41a28 Stop cost info getting into an infinite loop 2017-06-07 08:32:41 +07:00
6ea86b96
f97ec7b390 Store claims by id in the state 2017-06-07 08:30:17 +07:00
Jeremy Kauffman
059673983c Bump version: 0.12.0rc4 → 0.12.0rc5 2017-06-06 17:58:32 -04:00
Jeremy Kauffman
e1baebfec5 Merge branch '6ea86b96-npm-5' 2017-06-06 17:43:02 -04:00
Jeremy Kauffman
6f0e429ac4 Merge branch 'npm-5' of https://github.com/6ea86b96/lbry-app into 6ea86b96-npm-5 2017-06-06 17:41:25 -04:00
Jeremy Kauffman
e0bcf44202 Merge branch 'seanyesmunt-master' 2017-06-06 17:25:29 -04:00
Jeremy Kauffman
9c708ca93c correct prettier path 2017-06-06 17:23:58 -04:00
Jeremy Kauffman
2172555096 change prettier options 2017-06-06 17:19:12 -04:00
6ea86b96
955e9564e0
Some package tweaks for npm 5x 2017-06-06 23:58:16 +07:00
Sean Yesmunt
759a9011dc add prettier script 2017-06-06 09:24:55 -07:00
Alex Grintsvayg
6bc1405f2d Bump version: 0.12.0rc3 → 0.12.0rc4 2017-06-06 11:15:34 -04:00
Alex Grintsvayg
a10ebce017 changelog 2017-06-06 11:14:57 -04:00
Alex Grintsvayg
954db08bd1 use new fee metadata format 2017-06-06 11:14:08 -04:00
Sean Yesmunt
c8b949f020 format with prettier 2017-06-05 21:21:55 -07:00
Sean Yesmunt
6f93834990 add prettier 2017-06-05 21:20:41 -07:00