Commit graph

440 commits

Author SHA1 Message Date
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
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
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
Jeremy Kauffman
2172555096 change prettier options 2017-06-06 17:19:12 -04:00
Sean Yesmunt
c8b949f020 format with prettier 2017-06-05 21:21:55 -07:00
Fillerino
a2ec397ff8 Quick fix for Issue #198 , not being able to go to SEND/RECEIVE page
This commit fixes the missing _ in one of the i18n translation labels.
fixes #198
2017-06-05 22:35:24 +02:00
Jeremy Kauffman
c348f552cd Merge pull request #189 from 6ea86b96/play-more-file-types
Render all file types that render-media can handle
2017-06-05 11:40:11 -04:00
Mayesters
a539b58829 Include y18n without creating files + fix modal 2017-06-03 13:27:37 +02:00
Mayesters
4e86023bf1 Merge remote-tracking branch 'upstream/intnick-i18n' into i18n 2017-06-03 13:10:54 +02:00
6ea86b96
1fd1b3c064 Render all file types that render-media can handle 2017-06-03 01:29:08 +07:00
Jeremy Kauffman
f84c738018 changes to global declaration, eliminate translation files 2017-06-02 12:40:26 -04:00
Jeremy Kauffman
8ab629de01 Merge branch 'i18n' of https://github.com/intnick/lbry-app into intnick-i18n 2017-06-02 12:25:56 -04:00
Mayesters
81afbf8d70 Merge branch 'master' into i18n 2017-06-02 18:11:54 +02:00
6ea86b96
912933d4e7
Sync loading between file actions and video player 2017-06-02 14:40:40 +07:00
6ea86b96
8505959c22 Use render-media to render audio and images 2017-06-02 14:11:59 +07:00
6ea86b96
fa66f4e918 Fix download progress for recontructing files 2017-06-02 14:11:59 +07:00
Mayesters
c658211e2c merge translations fixed 2017-06-01 17:49:07 +02:00
Mayesters
0153a6dab5 Merge branch 'master' into i18n 2017-06-01 17:41:49 +02:00
Intnick
02ed8145ca Merge branch 'i18n' of github.com:intnick/lbry-app into i18n 2017-06-01 17:02:16 +02:00
Intnick
addf29f3bc global i18n object defined in app.js; smaller translation improvements 2017-06-01 17:02:02 +02:00
Jeremy Kauffman
9f1e5489a1 fix multiple install ids 2017-05-31 18:19:48 -04:00
Mayesters
313cea5580 fix master merge translations 2017-05-31 12:55:32 +02:00
Mayesters
31190ea5b0 Merge branch 'master' into i18n 2017-05-31 12:48:49 +02:00
Mayesters
fe7b5eb4e0 removed unnecessary y 2017-05-31 12:34:39 +02:00
Jeremy Kauffman
7a8a2c4913 connection changes and changelog 2017-05-30 19:56:48 -04:00
Jeremy Kauffman
c3eb921685 Merge branch 'master' into autoplay 2017-05-30 17:18:04 -04:00
6ea86b96
230e6e2d70 Fix autoplaying 2017-05-30 23:16:41 +04:00
Jeremy Kauffman
2bdc2ce268 fix close modal in video component 2017-05-30 14:12:07 -04:00
Mayesters
a8a42cee2e wunderbar translated 2017-05-28 21:35:21 +02:00
Mayesters
1a3c20a637 Translated updated components 2017-05-28 18:56:01 +02:00
Mayesters
804c9a646b Merge branch 'master' into i18n 2017-05-28 18:46:31 +02:00
Intnick
02b13fc252 i18n ready for testing 2017-05-28 18:36:35 +02:00
Intnick
13989632a7 language switch implementation. Needs more testing 2017-05-28 17:52:23 +02:00
Mayesters
469e769e01 lots of stuff translated 2017-05-28 17:52:23 +02:00
Intnick
1d09f08392 header and tranactionList component translated 2017-05-28 17:46:08 +02:00
Intnick
972ac78595 fileListSearch and fileTitle component translated 2017-05-28 17:46:08 +02:00
Intnick
7d6368aeca fileList component translated 2017-05-28 17:46:08 +02:00
Intnick
ff02e0452b filaActions and fileCard components translated 2017-05-28 17:45:40 +02:00
Intnick
d30d4353e8 moved the import of y18n component before some other imports; translations for auth developer 2017-05-28 17:33:25 +02:00
Jeremy Kauffman
6bccb67585 Merge pull request #153 from 6ea86b96/double-fetch-cost
Don't try to fetch cost info if it's already fetching
2017-05-28 11:28:14 -04:00
Jeremy Kauffman
fd093f0a95 Merge pull request #152 from 6ea86b96/file-actions-cost-info
Stop blowing up if user attempts to download before cost info fetched
2017-05-28 11:27:35 -04:00
6ea86b96
b2b99b31b9
Don't try to fetch cost info if it's already fetching 2017-05-28 19:16:07 +04:00
6ea86b96
37344b3517
Stop blowing up if user attempts to download before cost info fetched 2017-05-28 18:24:10 +04:00
6ea86b96
862d711391
Add a message for when we're reconstructing a moved/deleted file before playback 2017-05-28 17:38:36 +04:00
6ea86b96
2bb5f9acc6 Fix playing videos that were deleted and require no cost info 2017-05-26 22:50:43 +04:00
Jeremy Kauffman
260980ff38 fix app upgrades? 2017-05-25 16:07:32 -04:00
Jeremy Kauffman
a899d623d0 fix reward check on startup 2017-05-25 13:38:53 -04:00
Jeremy Kauffman
dd305c0a87 correct beta type ;) 2017-05-24 21:13:06 -04:00
Jeremy Kauffman
51a2f4f52e Merge branch 'api-fixes' 2017-05-24 20:10:36 -04:00
Jeremy Kauffman
a8082b0e0d minor style fix 2017-05-24 20:07:38 -04:00
Jeremy Kauffman
5d68da9dba fix access without code 2017-05-24 20:07:38 -04:00
Jeremy Kauffman
0c41cbb823 error and auth fixes 2017-05-24 20:07:38 -04:00
6ea86b96
3659c989b8
Display search results immediately if they are in the state 2017-05-23 12:59:35 +04:00
6ea86b96
27b9d844b7
Fix navigating back through search results 2017-05-23 12:46:52 +04:00
6ea86b96
53efd55890
Fix snackbar 2017-05-23 11:21:21 +04:00
Jeremy Kauffman
a08a214d34 fix text areas and bug reporting 2017-05-21 18:34:12 -04:00
Jeremy Kauffman
0936d28e5d minor bug fixes 2017-05-21 12:15:41 -04:00
Jeremy Kauffman
951190bf96 channel and file selector fixes 2017-05-21 10:42:34 -04:00
Jeremy Kauffman
bb16156034 re-enable rewards 2017-05-19 12:17:19 -04:00
Jeremy Kauffman
209db5e3d0 Merge branch 'redux' into es6-classes 2017-05-19 09:17:41 -04:00
Jeremy Kauffman
f60d17f604 Merge branch 'redux' into file-selector 2017-05-19 09:11:32 -04:00
Jeremy Kauffman
9d8fa102ee bug fixes, file info and my claims refactor, list claims in channel 2017-05-18 19:14:26 -04:00
Jeremy Kauffman
900c5cbc2b some progress towards cost and file info refactor, plus other fixes 2017-05-18 13:58:28 -04:00
Alex Liebowitz
09834941ab Convert more callbacks to arrow functions 2017-05-18 04:39:18 -04:00
Alex Liebowitz
3e35d44978 Basics of conversion to ES6 classes 2017-05-18 04:39:18 -04:00
Jeremy Kauffman
3fa4d0dfe7 progress towards fixing settings and costs 2017-05-17 17:52:45 -04:00
Jeremy Kauffman
aa935c1c07 more refactors, fixes 2017-05-15 12:34:33 -04:00
Jeremy Kauffman
6783bcdfeb i'm making things better... right? 2017-05-14 23:50:59 -04:00
Jeremy Kauffman
0fad6864ec let improvements and breaking continue 2017-05-12 18:50:51 -04:00
Jeremy Kauffman
c823ccd056 fix infinite resolve, add valid uri check 2017-05-12 16:49:15 -04:00
Jeremy Kauffman
950f3183cf more bug fixes + optimizations 2017-05-12 14:36:44 -04:00
Jeremy Kauffman
5605b10f54 more bug fixes and bugs 2017-05-12 13:14:06 -04:00
Alex Liebowitz
c8f7cb2110 Update FormField to use new Electron file/directory selector 2017-05-12 07:31:33 -04:00
Alex Liebowitz
044d3612c2 Add FileSelector component 2017-05-12 07:31:23 -04:00
Jeremy Kauffman
c1161fc10b mainly more bug fixes 2017-05-11 19:28:43 -04:00
Alex Grintsvayg
df7ce9cc64 api returns fields in lowercase now 2017-05-11 17:44:00 -04:00
Jeremy Kauffman
3c325b2f0a where's the triggers?! also very broken 2017-05-10 20:59:47 -04:00
Jeremy Kauffman
d517316554 some progress but also broken show 2017-05-09 23:06:48 -04:00
Jeremy Kauffman
1dedb9873c more fixes but not all of the fixes :( 2017-05-09 21:33:13 -04:00
Jeremy Kauffman
60d298b354 Merge remote-tracking branch 'origin/master' into redux 2017-05-09 16:58:48 -04:00
Jeremy Kauffman
9c02327b26 merge plus some bug fixes 2017-05-09 16:12:48 -04:00
6ea86b96
786f57e787
Fix search results html 2017-05-09 14:33:01 +07:00
6ea86b96
84b86ff8e4
Make FileTile resolve URIs (fixes exact search matching) 2017-05-09 13:38:43 +07:00
Jeremy Kauffman
e4ca14aa47 fix some minor things with search 2017-05-08 18:22:27 -04:00
6ea86b96
4b5187bc7f
Better search 2017-05-07 19:50:32 +07:00
6ea86b96
225921c0a4
Use HTML from master file tile stream 2017-05-07 14:07:40 +07:00
6ea86b96
d2c97d3460
Back button working properly 2017-05-06 23:31:47 +07:00
6ea86b96
fb3d366fe0
Fix upgrading and start on history 2017-05-06 00:05:33 +07:00
6ea86b96
29c53a9bf8
Search kind of working, but nasty 2017-05-05 15:01:16 +07:00
6ea86b96
daabe975e1
Add showPage again. Not 100% sure if it's needed? 2017-05-05 13:13:06 +07:00
6ea86b96
494d885f31
Use SubHeader for all sub navigation 2017-05-05 12:28:28 +07:00
6ea86b96
ac626ab9f9
File page working 2017-05-05 12:10:37 +07:00
Alex Liebowitz
536c5391fb Make error modals display full screen properly
Was not passing in the generic modal-overlay class. (ExpandableModal
doesn't provide it automatically so you can omit it and make a totally
custom overlay if you want.)
2017-05-05 00:46:10 -04:00
Jeremy Kauffman
36a992343f much progress towards a working merge 2017-05-03 23:44:08 -04:00
Jeremy Kauffman
d94ef70f60 more bug fixes 2017-05-02 19:49:02 -04:00
6ea86b96
e1e172a11e Switch to https://github.com/Selz/plyr video player (recommended by @fillerino). 2017-05-02 19:43:34 -04:00
6ea86b96
44ad47c05f Fix publish page link in router 2017-05-02 19:41:37 -04:00
6ea86b96
513555e402 Fix for timed out content 2017-05-02 19:40:42 -04:00
6ea86b96
6d35eb69c5 File tile stream fixes 2017-05-02 19:40:42 -04:00
6ea86b96
001d5e21f1 Get rewards page working 2017-05-02 19:40:42 -04:00
6ea86b96
b97703dc3c Refactor UriIndicator 2017-05-02 19:38:14 -04:00
6ea86b96
2547d85751 Fix file card stream loading text 2017-05-02 19:37:15 -04:00
6ea86b96
3c31a9fca1 Published files working 2017-05-02 19:36:31 -04:00
6ea86b96
84a2f48c24 Increase deactivate search timeout 2017-05-02 19:35:59 -04:00
6ea86b96
1d549ff258 Fix purchasing from file actions and allow content to be watched when being
downloaded from file actions download link
2017-05-02 19:35:59 -04:00
6ea86b96
7a6dd93886 Downloaded file list kind of working. Not sure about sort. 2017-05-02 19:35:59 -04:00
6ea86b96
e1d23667bc Fix NSFW blurring on search and make search show/hide smarter 2017-05-02 19:35:22 -04:00
6ea86b96
1d16c73cf4 More refactoring/fixing of file actions, tiles, etc 2017-05-02 19:34:01 -04:00
6ea86b96
f08ce3d300 A bunch of improvements and broken the back of the file rendering code now 2017-05-02 19:31:34 -04:00
6ea86b96
b0f32aebc7 Refactoring 2017-05-02 19:30:28 -04:00
6ea86b96
13008f5f31 Videos playing properly immediately after purchase 2017-05-02 19:29:10 -04:00
6ea86b96
0d658b2767 Playing videos actually working now 2017-05-02 19:27:57 -04:00
6ea86b96
e0b78368ab Playing videos working better 2017-05-02 19:25:06 -04:00
6ea86b96
674fafd31a Able to watch already downloaded videos 2017-05-02 19:23:52 -04:00
6ea86b96
67b79fc3a0 Search working 2017-05-02 19:22:44 -04:00
6ea86b96
768326fb4a Working on search 2017-05-02 19:20:53 -04:00
6ea86b96
bb9a71805b Loading show page content fast, resolving cost and file info.
Rewards and uploaded/downloaded files currently broken
2017-05-02 19:16:42 -04:00
6ea86b96
6c4ad8cee9 Starting on downloaded/published content 2017-05-02 19:13:01 -04:00
6ea86b96
5c3772dc86 Featured content 2017-05-02 19:10:35 -04:00
6ea86b96
ecd2063fed Progress on featured content 2017-05-02 19:07:46 -04:00
6ea86b96
089572880f Wallet progress 2017-05-02 18:47:03 -04:00
Jeremy Kauffman
cee2f2a626 watch page is ded 2017-05-02 18:37:54 -04:00
Jeremy Kauffman
a123ace686 remove console 2017-05-02 18:37:54 -04:00
Jeremy Kauffman
d5b411b572 fix drawer highlight and drawer balance 2017-05-02 18:37:54 -04:00
6ea86b96
3d5e1db5e3 Redux proof of concept 2017-05-02 18:37:19 -04:00
6ea86b96
0d3647c709 Redux proof of concept 2017-05-02 18:24:21 -04:00
Jeremy Kauffman
13e198f20e releasable? 2017-05-02 10:21:33 -04:00
Jeremy Kauffman
3f923550f1 fixes, channel page stubs 2017-05-02 10:21:33 -04:00
Jeremy Kauffman
5b11c2575a still not quite releasable, but much progress 2017-05-02 10:21:33 -04:00
Jeremy Kauffman
da538a7a23 many bug fixes, working back button, progress towards working search 2017-05-02 10:21:33 -04:00
Alex Liebowitz
a82ee8a2d5 Fix refreshing behavior on new input in WunderBar
Before, <WunderBar /> would compare the address inside it to the page
address passed in by <Header /> to determine if there was a page change.
This would cause user input to be replaced with "Home" when typing a
search, since during a search the page address is always "Home," not
the query.

Now it simply checks if the page being viewed has changed.
2017-05-02 10:21:33 -04:00
Alex Liebowitz
e42252507b Minor style fixes 2017-05-02 10:21:33 -04:00
Jeremy Kauffman
543b912ddb more cleanup / restoration 2017-05-02 10:21:33 -04:00
Jeremy Kauffman
71771aeb6f it's not the worst thing I've ever done 2017-05-02 10:21:33 -04:00
Alex Liebowitz
778289a2b1 Make final dialog of auth process close properly 2017-05-02 03:29:03 -04:00
Alex Liebowitz
0ffb0fd4d7 Replace all uses of bind() with arrow functions 2017-04-29 22:05:47 -04:00
Alex Grintsvayg
e06c2320e1 prefer wallet_unused_address over wallet_new_address 2017-04-27 14:18:59 -04:00
Jeremy Kauffman
a8d85d7c1d allow anyone with lbc into early access 2017-04-20 10:45:45 -04:00
Jeremy Kauffman
e73f367045 always show title on mouseover 2017-04-20 10:45:45 -04:00
Jeremy Kauffman
a66a5edc67 Merge pull request #49 from lbryio/uri-improvements
Improve URI module
2017-04-19 14:11:44 -04:00
Alex Liebowitz
ca6d55da21 Add special support for building channel claims in lbryuri module
Extends lbryuri.build() and lbryuri.parse() to support special
keys, contentName and channelName. These put the right values in the
"name" and "path" position for both anonymous claims and channel
content claims, which lets us write code that can deal with either type
without special logic.
2017-04-19 14:06:29 -04:00
Jeremy Kauffman
90e6f16e82 handle duplicate emails 2017-04-18 16:51:00 -04:00
Jeremy Kauffman
b30bfd9f61 auth fix and partial other auth fix 2017-04-18 15:45:15 -04:00
Alex Liebowitz
7a4e9ad656 Rename uri module and its functions 2017-04-18 15:14:56 -04:00
Jeremy Kauffman
b3d1439870 render tiles before they load 2017-04-17 17:51:18 -04:00
Alex Liebowitz
757ab11779 Compute cost estimate on client side when possible 2017-04-17 17:21:35 -04:00
Alex Liebowitz
94b60beebc Update download notice modal to include price 2017-04-17 17:20:24 -04:00
Alex Liebowitz
5fe9f076eb Update handling of file prices
- Until Lighthouse results come back, display just the key fee
 - Add support for displaying prices without special formatting
 - Refactor and simplify FilePrice and CreditAmount
2017-04-17 17:19:19 -04:00
Alex Liebowitz
7644566ef5 Add ability to display non-styled prices and credit amounts 2017-04-17 17:19:18 -04:00
Jeremy Kauffman
c252c757b0 minor changes 2017-04-17 16:45:51 -04:00
Jeremy Kauffman
e9c8abd307 rewards flow changes 2017-04-17 09:47:38 -04:00
Jeremy Kauffman
8d67d36ad9 views, rewards, fixes for no api, other fixes 2017-04-17 09:47:38 -04:00
Alex Liebowitz
d926967e49 Correct and simplify metadata processing in dummy pending publishes 2017-04-17 09:47:38 -04:00
Jeremy Kauffman
9b4d8ec266 more show/purchase work 2017-04-17 09:47:38 -04:00
Jeremy Kauffman
280f98902c closer to real watch 2017-04-17 09:47:38 -04:00
Alex Liebowitz
83f43ab54f More improvements for better compatibility with new claim format
- Update Pending Files cache to match format more closely
 - Except null instead of string for pending publishes
2017-04-17 09:47:37 -04:00
Jeremy Kauffman
736d769fa6 minor fixes, cost cache 2017-04-17 09:47:37 -04:00
Jeremy Kauffman
c8c97e97ca update 2017-04-17 09:47:37 -04:00
Jeremy Kauffman
b38998dc18 more fixes 2017-04-17 09:46:51 -04:00
Jeremy Kauffman
a5d1695084 more tweaks and turn off auth 2017-04-17 09:46:51 -04:00
Jeremy Kauffman
cb4af24cd7 more clean up and fixes 2017-04-17 09:46:51 -04:00
Jeremy Kauffman
0313ba941a approaching acceptable 2017-04-17 09:46:51 -04:00
Jeremy Kauffman
029b0b9c3a more 2017-04-17 09:46:51 -04:00
Jeremy Kauffman
ecf54f400b mostly garbage 2017-04-17 09:46:51 -04:00
Jeremy Kauffman
575db85477 so far 2017-04-17 09:46:51 -04:00
Alex Liebowitz
498618e39b More revisions to Welcome screen
- Eliminate intro page
 - Add "verify email" page
 - Move buttons into individual components
 - Claim reward (not handling reporting success/failure yet)
2017-04-17 09:46:51 -04:00
Alex Liebowitz
26aba5fb04 Random corrections and style fixes 2017-04-17 09:46:51 -04:00
Alex Liebowitz
7b7e361bdd Add notification bar
Used for displaying global info (e.g. "you just got a reward.")
Can be displayed from anywhere in the app using events.
2017-04-17 09:46:51 -04:00
Alex Liebowitz
b975fab1bb Add email section to Welcome screen 2017-04-17 09:46:51 -04:00
Alex Liebowitz
7f8bf8a2e2 Add Welcome screen 2017-04-17 09:46:51 -04:00
Alex Liebowitz
3749e0393a Reward: add error handling
Also adds Notice component
2017-04-17 09:46:51 -04:00
Alex Liebowitz
5577b436d3 Use resolve API method on splash screen 2017-04-11 00:14:52 -04:00
Alex Liebowitz
f64ad6e169 Fix merging error in FileActions 2017-04-10 22:42:20 -04:00
Alex Liebowitz
3b72938b74 Refactor file tiles to be compatible with channels 2017-04-10 21:55:34 -04:00
Alex Grintsvayg
096659bc90 fix availability call 2017-04-10 13:19:11 -04:00
Alex Liebowitz
461f5f95d9 Add new channel auth status indicator to file tiles 2017-04-08 08:37:27 -04:00
Alex Liebowitz
3e2b675e7b Add channel indicator component 2017-04-08 08:37:27 -04:00
Alex Liebowitz
b8f1447b7e Don't display Downloading bar on published files
We handled this just fine until recently; not sure where the regression
happened.
2017-03-27 03:10:02 -04:00
Jeremy Kauffman
dc13de7160 make page changes fast 2017-03-26 14:30:18 -04:00
Alex Grintsvayg
20064ee558 some progress, but needs more work 2017-03-17 18:05:25 -04:00
Alex Liebowitz
0b79e49452 Add context menu
Has Cut, Copy, Paste, and when in developer mode there's also Inspect Element
2017-03-17 07:53:34 -04:00
Alex Liebowitz
3b428c394c Convert UI to use outpoints for unique IDs
This covers *almost* everything. There are a couple of places that
still use names or SD hashes because the APIs haven't been updated
yet.
2017-03-09 17:55:17 -05:00
Alex Grintsvayg
05d4a07312 Add 'ui/' from commit 'efc28c6644b7970403e3a11523cbf6e336eee52d'
git-subtree-dir: ui
git-subtree-mainline: 3886c7bf2c
git-subtree-split: efc28c6644
2017-03-09 12:11:46 -05:00