Commit graph

2507 commits

Author SHA1 Message Date
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
Jeremy Kauffman
b28b116a24 Merge pull request #116 from lbryio/uri-handling
URI handling (WIP)
2017-05-08 10:11:18 -04:00
Alex Liebowitz
2761ebbd92 Attach did-finish-load event to win.webContents instead of win 2017-05-08 05:22:38 -04:00
Alex Liebowitz
ef4274012f Add better handling for URIs requested during load 2017-05-08 05:04:11 -04:00
Alex Liebowitz
38ea41775b Avoid page reload when loading URIs passed in from other apps 2017-05-08 02:36:48 -04:00
Alex Liebowitz
499fa1214f Fix variable name in open URI callback 2017-05-08 02:33:54 -04:00
Jeremy Kauffman
c0053363ff Merge pull request #118 from 6ea86b96/redux
Redux
2017-05-07 09:02:20 -04:00
6ea86b96
4b5187bc7f
Better search 2017-05-07 19:50:32 +07:00
6ea86b96
b19e356a06
Remove wallet new address logging 2017-05-07 16:18:18 +07:00
6ea86b96
e08419e534
Save receive address in localStorage to prevent new receive address creation on
every boot
2017-05-07 16:17:38 +07:00
6ea86b96
58c06e17c9
Fix dashboard loading message 2017-05-07 14:39:13 +07:00
6ea86b96
225921c0a4
Use HTML from master file tile stream 2017-05-07 14:07:40 +07:00
6ea86b96
3085b2d362
A couple of minor history fixes 2017-05-07 00:57:34 +07:00
6ea86b96
d2c97d3460
Back button working properly 2017-05-06 23:31:47 +07:00
6ea86b96
fcea4cb305
Progress on navigation 2017-05-06 14:25:14 +07:00
6ea86b96
fb3d366fe0
Fix upgrading and start on history 2017-05-06 00:05:33 +07:00
Jeremy Kauffman
e4c82ffceb Merge pull request #113 from lbryio/fix-error-modals
Make error modals display full screen properly
2017-05-05 09:00:10 -04:00
Jeremy Kauffman
f5dec02fd9 Merge pull request #114 from lbryio/version-info-logic-fix
Don't try to send version info to render process if window isn't open
2017-05-05 08:59:24 -04:00
Alex Liebowitz
758bb59ccb Add basics of URI handling for Mac and Windows 2017-05-05 05:19:15 -04:00
6ea86b96
89e91c6d8a
Add downloaded/published nav and comment out broken reward code 2017-05-05 15:10:51 +07:00
6ea86b96
29c53a9bf8
Search kind of working, but nasty 2017-05-05 15:01:16 +07:00
Alex Liebowitz
9fc2a70ee5 Don't try to send version info to render process if window isn't open 2017-05-05 02:19:52 -04:00
6ea86b96
daabe975e1
Add showPage again. Not 100% sure if it's needed? 2017-05-05 13:13:06 +07:00
6ea86b96
f2490c902f
Missed NavSettings 2017-05-05 12:48:15 +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
6ea86b96
d7f84caaa4
Add webpack build notifications in dev 2017-05-05 11:28:30 +07:00
6ea86b96
ca2c678301 Merge branch 'redux' of https://github.com/lbryio/lbry-app into redux 2017-05-05 11:15:20 +07:00
Alex Grintsvayg
2cc60fade1 Bump version: 0.10.0rc9 → 0.10.0 2017-05-04 13:54:11 -04:00
Jeremy Kauffman
b70f169256 much progress towards a working merge 2017-05-04 11:59:46 -04:00
Jeremy Kauffman
cfedb4a860 more bug fixes 2017-05-04 11:59:46 -04:00
6ea86b96
3693c36a20 Fix accidental commit 2017-05-04 11:59:46 -04:00
6ea86b96
2b0c9bd17a Switch to https://github.com/Selz/plyr video player (recommended by @fillerino). 2017-05-04 11:59:46 -04:00
6ea86b96
6d913236e1 Fix publish page link in router 2017-05-04 11:59:46 -04:00
6ea86b96
82fd7e25ad Start on publish page 2017-05-04 11:59:46 -04:00
6ea86b96
64dfa70551 Fix for timed out content 2017-05-04 11:59:46 -04:00
6ea86b96
557a2dffc1 File tile stream fixes 2017-05-04 11:59:46 -04:00
6ea86b96
bb6df4169b Get rewards page working 2017-05-04 11:59:46 -04:00
6ea86b96
1c26213fff Refactor UriIndicator 2017-05-04 11:59:46 -04:00
6ea86b96
a5e7843e9c Fix file card stream loading text 2017-05-04 11:59:46 -04:00
6ea86b96
1f22a3353b Add missing DAEMON_READY reducer 2017-05-04 11:59:46 -04:00
6ea86b96
124cc54a77 Jam claim next purchase reward in 2017-05-04 11:59:45 -04:00
6ea86b96
da98d02fb1 Published files working 2017-05-04 11:59:45 -04:00
6ea86b96
8f57420127 Increase deactivate search timeout 2017-05-04 11:59:45 -04:00
6ea86b96
c85228f3a4 Fix purchasing from file actions and allow content to be watched when being
downloaded from file actions download link
2017-05-04 11:59:45 -04:00