Commit graph

1195 commits

Author SHA1 Message Date
Jack
41a0590182 fix daemon directories for linux 2016-03-28 14:53:32 -04:00
Jack
63b2c49354 don't start lbry app if daemon is running in console 2016-03-28 14:21:41 -04:00
Alex Grintsvayg
c99d7ce89d fix weird version, add required fields for deb package 2016-03-27 18:20:02 -04:00
Alex Grintsvayg
79e382e064 add requirements.txt so we can have repeatable builds 2016-03-27 18:19:53 -04:00
Jack
fa1d4dae0f add --ui parameter to lbrynet-daemon to set ui path
defaults on temp, which will download a .zip of the current ui to a
temp directory, which will be deleted when lbrynet-daemon closes
2016-03-25 21:03:58 -04:00
Jack
35f84b4414 Merge branch 'master' into development 2016-03-25 21:02:51 -04:00
Jack
a882bdb08c fix output of get_time_behind_blockchain function 2016-03-25 09:32:24 -04:00
Jimmy Kiselak
b5c2e1c95b Merge branch 'development' 2016-03-24 22:16:07 -04:00
Jack
cfd6ea5a34 Merge branch 'development' 2016-03-24 21:15:54 -04:00
Jack
b3cf5e8698 add bundle identifier to uri handler 2016-03-24 20:46:44 -04:00
Jimmy Kiselak
2d07223995 Merge branch 'fixsetuptools' into development 2016-03-24 20:01:05 -04:00
Jimmy Kiselak
32bb9fd4ec reorder setuptools 2016-03-24 20:00:56 -04:00
Jack Robison
37b5f22c1a Merge pull request #23 from lbryio/jsonrpc
Jsonrpc
2016-03-23 22:37:29 -04:00
Jack
e0b00c09ce fix conflicts 2016-03-23 22:36:14 -04:00
Jack
71c4dba34d Merge branch 'development' into jsonrpc
# Conflicts:
#	setup.py
2016-03-23 22:34:27 -04:00
Jack
9a3187e36c merge updates 2016-03-23 22:29:48 -04:00
Jack
c714a3f91c merge updates 2016-03-23 22:27:48 -04:00
Jimmy Kiselak
5d4846cf60 Merge branch 'versioning' into development 2016-03-23 22:07:11 -04:00
Jack
543b327d09 use only six 1.9 on os x 2016-03-23 22:06:04 -04:00
Jimmy Kiselak
1ccd2a3cc9 do version better 2016-03-23 22:02:02 -04:00
Jack
94398071eb have uri handler check if app is running
-checks if LBRY.app is running, starts it if it isn’t

-delete unused function in LBRYDaemon
2016-03-23 19:49:14 -04:00
Jimmy Kiselak
143476c76c Merge branch 'showwalletcatchup' into development 2016-03-22 22:43:10 -04:00
Jimmy Kiselak
e85683e40f show more informative messages when blockchain is catching up 2016-03-22 22:42:45 -04:00
Alex Grintsvayg
141162e5ae fixes so we can build an sdist 2016-03-22 22:15:07 -04:00
Jack
13acbfb64f update uri handler
-use new jsonrpc daemon, start app if it isn’t running on first lbry://
request
2016-03-22 11:51:27 -04:00
Jack
a55e3d8578 use UI downloaded to temp folder at startup 2016-03-22 10:37:13 -04:00
Jack
2486ae6d3f get rid of unused updater function
updater function was hacky and not the most reliable, to be replaced by
app version checking
2016-03-22 09:40:18 -04:00
Jack
ba991b47ea add /view to dynamically generate a video containing page
-uses UI stored in Resources folder of app

-going to /view?name=  will download the corresponding stream and
display the file in the browser

-adds default daemon settings, currently they don’t do anything, to be
added to

-adds missing packages to setup.py
2016-03-22 00:03:17 -04:00
Jimmy Kiselak
a096d0db37 Merge branch 'versioning' into development 2016-03-21 21:37:26 -04:00
Jimmy Kiselak
e4a30c052e put the actual version in __init__.py 2016-03-21 21:37:15 -04:00
Jimmy Kiselak
ccfe80ecfa Merge branch 'versioning' into development 2016-03-21 21:34:05 -04:00
Jimmy Kiselak
df5b889f7d add a version to lbrynet 2016-03-21 21:33:55 -04:00
Jack
55f25c2613 consolidate search output
consolidate search output into a list of dicts
2016-03-21 12:06:19 -04:00
Jack
34eaa822a0 handle null parameter 2016-03-21 10:12:01 -04:00
Jack
5072f503c4 fix cross scripting problem
add access-control-allow-origin: http://localhost:5279
2016-03-20 22:53:01 -04:00
Jimmy Kiselak
8e6b5a5e55 Merge branch 'fewerlogstatements' into development 2016-03-19 22:39:59 -04:00
Jimmy Kiselak
246647641a remove some log statements that are useless, instead log whenever balance changes 2016-03-19 22:39:47 -04:00
Jimmy Kiselak
06a1bdbcba Merge branch 'lbcpatience' into development 2016-03-19 22:33:56 -04:00
Jimmy Kiselak
a0b75d7ada Tell user to be patient if it's the first run and user has no funds, in two more places 2016-03-19 22:30:55 -04:00
Jimmy Kiselak
d36036a9fe Tell user to be patient if it's the first run and user has no funds 2016-03-19 21:50:38 -04:00
Jimmy Kiselak
a68d891770 enable checking first run status multiple times 2016-03-19 21:24:44 -04:00
Jimmy Kiselak
f272a9ead2 Merge branch 'badunicode' into development 2016-03-19 18:56:21 -04:00
Jimmy Kiselak
8db2e10696 Merge branch 'master' of github.com:lbryio/lbry 2016-03-19 18:55:50 -04:00
Jimmy Kiselak
bea4f7da98 Merge branch 'badunicode' 2016-03-19 18:55:37 -04:00
Jimmy Kiselak
3cd74c06d6 convert description in ControlHandlers to str so that the prompt does not get converted to unicode 2016-03-19 18:55:17 -04:00
Jack Robison
053681e4a5 Merge pull request #21 from lbryio/detect-if-daemon-is-running
check if daemon is running before starting console
2016-03-17 23:08:12 -04:00
Jack
e3225f7123 add missing commits 2016-03-17 22:50:15 -04:00
Jack
ef62b0e746 fix conflicts 2016-03-17 22:38:48 -04:00
Jack
7756d12993 check if daemon is running before starting console 2016-03-17 22:03:56 -04:00
Jimmy Kiselak
3b92d12a44 Merge branch 'walletbalancerefresh' into development 2016-03-17 21:55:20 -04:00