Jack
|
a8a581d35c
|
Merge branch 'master' into auth-jsonrpc
# Conflicts:
# lbrynet/conf.py
# lbrynet/core/Error.py
# lbrynet/lbrynet_daemon/Daemon.py
# lbrynet/lbrynet_daemon/DaemonControl.py
# lbrynet/lbrynet_daemon/ExchangeRateManager.py
|
2016-10-14 18:25:37 -04:00 |
|
Alex Liebowitz
|
0dd9aa0d67
|
Update error that daemon catches for malformed metadata
Now jsonschema.ValidationError instead of AssertionError
|
2016-10-14 10:37:19 -04:00 |
|
Job Evers-Meltzer
|
e647663c34
|
Fix error when version is None
Logs were reporting:
Failure instance: Traceback: <type 'exceptions.AttributeError'>: StrictVersion instance has no attribute 'version'
/Volumes/LBRY/LBRY.app/Contents/Resources/lib/python2.7/lbrynet/lbrynet_daemon/DaemonServer.py:121:requestReceived
twisted/web/server.pyc:183:process
twisted/web/server.pyc:234:render
/Volumes/LBRY/LBRY.app/Contents/Resources/lib/python2.7/lbrynet/lbrynet_daemon/Daemon.py:450:render
--- <exception caught here> ---
twisted/internet/defer.pyc:150:maybeDeferred
/Volumes/LBRY/LBRY.app/Contents/Resources/lib/python2.7/lbrynet/lbrynet_daemon/Daemon.py:1561:jsonrpc_version
/Volumes/LBRY/LBRY.app/Contents/Resources/lib/python2.7/lbrynet/core/utils.py:39:version_is_greater_than
distutils/version.pyc:140:__cmp__
|
2016-10-14 10:35:17 -04:00 |
|
Jack Robison
|
32a973943f
|
Merge pull request #173 from lbryio/blob-prices
Blob prices
|
2016-10-13 14:59:26 -04:00 |
|
Jack
|
19c2264429
|
clean up
|
2016-10-13 13:35:55 -04:00 |
|
Jack
|
50e5a59420
|
remove unused imports
|
2016-10-07 17:29:20 -04:00 |
|
Jack
|
5a0b5dc680
|
Merge branch 'master' into auth-jsonrpc
# Conflicts:
# lbrynet/lbrynet_daemon/Daemon.py
# lbrynet/lbrynet_daemon/DaemonControl.py
|
2016-10-07 17:11:43 -04:00 |
|
Jack
|
88be425ab2
|
fix pylint errors
|
2016-10-05 23:24:22 -04:00 |
|
Job Evers-Meltzer
|
a71e87a398
|
throw error when invalid wallet is specified
|
2016-10-04 13:59:04 -05:00 |
|
Job Evers-Meltzer
|
0ecfad0ae9
|
add configuration to LBRYumWallet
|
2016-10-04 13:58:44 -05:00 |
|
Job Evers-Meltzer
|
e909ae566b
|
add TODO
|
2016-10-03 16:19:58 -05:00 |
|
Jack
|
d741c705cd
|
add some tests, don't use lighthouse for cost ests
|
2016-10-01 01:09:27 -04:00 |
|
Jack
|
640e000b9f
|
fix timeouts in get_availability
|
2016-09-30 13:35:13 -04:00 |
|
Jack
|
8d961d6ce6
|
add get_availability
|
2016-09-30 13:28:01 -04:00 |
|
Jack
|
71b989b29b
|
update from master
resolve merge conflicts:
lbrynet/core/client/BlobRequester.py
lbrynet/core/Peer.py
lbrynet/lbryfilemanager/EncryptedFileManager.py
lbrynet/lbrynet_daemon/Daemon.py
lbrynet/lbrynet_daemon/Publisher.py
|
2016-09-29 23:34:59 -04:00 |
|
Jack
|
ff7829a078
|
Merge branch 'master' into rename-LBRY
|
2016-09-29 12:47:22 -04:00 |
|
Job Evers-Meltzer
|
a099e2db6a
|
fix errors
|
2016-09-27 11:18:52 -07:00 |
|
Job Evers-Meltzer
|
7dbeb1f2cf
|
Remove LBRY prefix from class and module names
This is the result of running:
grep -RlI LBRY . | xargs sed -i 's/LBRY\([A-Z]\)/\1/g'
|
2016-09-27 11:18:35 -07:00 |
|
Job Evers-Meltzer
|
550fd185a3
|
rename LBRYFile to EncryptedFile
|
2016-09-27 11:18:16 -07:00 |
|
Job Evers-Meltzer
|
078b254d1d
|
rename files to remove LBRY prefix
|
2016-09-25 18:11:23 -07:00 |
|