Commit graph

1931 commits

Author SHA1 Message Date
Jeremy Kauffman
84589f1ebb Merge branch 'longle255-fix_loading_help_menu' 2017-06-13 15:59:10 -04:00
Jeremy Kauffman
6d41006918 Merge branch 'fix_loading_help_menu' of https://github.com/longle255/lbry-app into longle255-fix_loading_help_menu 2017-06-13 15:45:13 -04:00
Jeremy Kauffman
ba27b7fe69 Merge pull request #232 from lbryio/lock-files
Regenerate lock files
2017-06-13 14:35:24 -04:00
Le Long
bbaec6bfe0 add changelog 2017-06-13 17:03:18 +02:00
Le Long
d52d8872be use ipcRenderer as bridge for communication between electron and ui app 2017-06-13 17:02:06 +02:00
6ea86b96
d59f5f1005
Regenerate lock files 2017-06-13 11:19:56 +07:00
Mayesters
148392d49a update script again 2017-06-12 21:18:20 +02:00
Jeremy Kauffman
c47fb7cb2b Merge pull request #222 from seanyesmunt/webpack-2
webpack@2
2017-06-12 12:07:12 -04:00
Mayesters
ef568ef816 made script easier 2017-06-12 12:34:40 +02:00
Mayesters
9b32c764ac Extract Locals script basic setup 2017-06-12 12:20:50 +02:00
Mayesters
e83ace19c5 Merge remote-tracking branch 'upstream/master' 2017-06-12 11:11:13 +02:00
Jeremy Kauffman
1fc7c92524 Merge pull request #223 from lbryio/video-fallback
Metadata at end
2017-06-11 12:10:41 -04:00
Sean Yesmunt
3a89a75e7d consistent quote type 2017-06-10 21:59:33 -07:00
6ea86b96
03f0c3ae8f Prettier fixes 2017-06-11 00:17:55 +07:00
6ea86b96
bfa9f6581f lock file updates. Are these files more trouble than they're worth? 2017-06-11 00:17:55 +07:00
6ea86b96
afcdd2271e Catch and render files with metadata at the end. Also notify if a file is
unplayable
2017-06-11 00:17:52 +07:00
Jeremy Kauffman
96265b9ae6 Merge pull request #217 from seanyesmunt/master
move why-did-you-update to package.json ui/
2017-06-10 11:30:27 -04:00
Sean Yesmunt
d4afa34d48 update webpack.config for v2 2017-06-09 22:13:11 -07:00
Sean Yesmunt
dd0bb16e58 update webpack.dev.config for v2 2017-06-09 22:03:02 -07:00
Sean Yesmunt
ab6d730091 update package-lock.json 2017-06-09 21:03:38 -07:00
Jeremy Kauffman
6bfce16f2e remove typo in settings page 2017-06-09 17:23:08 -04:00
Jeremy Kauffman
3f68858cf7 Bump version: 0.12.0rc8 → 0.12.0 2017-06-09 14:31:39 -04:00
Jeremy Kauffman
49c255e29a Bump version: 0.12.0rc7 → 0.12.0rc8 2017-06-09 13:13:34 -04:00
Jeremy Kauffman
c1f5215a4f update daemon to 0.11 proper 2017-06-09 13:13:20 -04:00
Jeremy Kauffman
d4e95c59ed Merge pull request #218 from lbryio/fix-publish-my-claims-display
Fix display of info about user's own claims on Publish page (WIP)
2017-06-09 10:49:23 -04:00
Jeremy Kauffman
cfa3aa3bc4 Merge branch 'master' into fix-publish-my-claims-display 2017-06-09 10:49:12 -04:00
Alex Grintsvayg
6cf5c144b0 Bump version: 0.12.0rc6 → 0.12.0rc7 2017-06-09 10:23:47 -04:00
Alex Grintsvayg
668a8b40e9 what is up with these files? 2017-06-09 10:23:36 -04:00
Alex Grintsvayg
902fb96878 Merge branch 'tear_down_this_wall'
* tear_down_this_wall:
  bump daemon version
  restore purecomponent, remove console.log
  changelog and bugfix
  reviewable
  mostly done?
  previously uncommitted copy change
  not enough progress
  uncommitted work from last night
  good chunk of progress towards auth and rewards refactor / degating
  Working on rewards refactor
  midway through auth rewrite
  slight progress
2017-06-09 10:18:25 -04:00
Alex Liebowitz
342afc6873 Fetch claim list on Publish page
Before, it would only receive the list of published claims if it had
already been fetched from previously viewing the My Files page
2017-06-09 06:58:20 -04:00
Sean Yesmunt
11d80c1361 move why-did-you-update to ui 2017-06-08 22:22:45 -07:00
Jeremy Kauffman
20fa2bb0e5 bump daemon version 2017-06-08 20:11:51 -04:00
Jeremy Kauffman
9418e78046 restore purecomponent, remove console.log 2017-06-08 20:10:53 -04:00
Jeremy Kauffman
241a0118a2 Merge remote-tracking branch 'origin/master' into tear_down_this_wall 2017-06-08 20:03:11 -04:00
Jeremy Kauffman
69bf1bdfea two more pure components 2017-06-08 19:41:44 -04:00
Jeremy Kauffman
418394446d Merge pull request #209 from seanyesmunt/should-component-update
Use React.PureComponent and add whyDidYouUpdate for dev env
2017-06-08 19:37:58 -04:00
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