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
Jimmy Kiselak
4449bf3c75
change manage timer back to 60 seconds
2016-03-17 21:55:06 -04:00
Jimmy Kiselak
0200ed1341
refresh wallet balance every 3 seconds instead of 60
2016-03-17 20:19:13 -04:00
Jack
02bde900d6
update daemon and console
...
-don’t start console if daemon is running, display a message alerting
user
-move os x data directory to match app
-add timeout parameter to get function
2016-03-17 10:19:36 -04:00
Jack
36e299b4cf
fix files
...
-don’t automatically remove files that can’t be found from
LBRYFileManager
-add timeout to GetStream
2016-03-17 00:44:04 -04:00
Jack
4e34f861c9
Merge branch 'development' into jsonrpc
2016-03-15 23:02:06 -04:00
Jack
42df2fe242
update daemon
...
convert to jsonrpc, fix a few issues, remove hacky functions
2016-03-14 12:30:22 -04:00
Jimmy Kiselak
7f11da8650
Merge branch 'walletcatchup' into development
2016-03-12 14:59:23 -05:00
Jimmy Kiselak
dff0fcb1fd
ensure the lbryum wallet is caught up before giving the prompt
2016-03-12 14:58:58 -05:00
Jimmy Kiselak
c31d22f996
Merge branch 'metadata' into development
2016-03-12 14:46:31 -05:00
Jimmy Kiselak
14ab2b52e9
create fee field in metadata
2016-03-12 14:42:57 -05:00
Jimmy Kiselak
e91f34f09b
change metadata structure to use sources key
2016-03-12 14:25:46 -05:00
Jimmy Kiselak
6c733f84e9
Merge branch 'stopexceptions' into development
2016-03-12 14:08:42 -05:00
