Job Evers-Meltzer
|
0edacbe4c8
|
Merge remote-tracking branch 'origin/master' into refactor-settings
Conflicts:
lbrynet/conf.py
lbrynet/lbrynet_daemon/Daemon.py
lbrynet/lbrynet_daemon/DaemonCLI.py
lbrynet/lbrynet_daemon/UIManager.py
tests/functional/test_misc.py
|
2016-10-27 10:18:56 -05:00 |
|
Jack
|
1951ea09cd
|
updates from master, more refactoring
-lbrynet.lbrynet_daemon.auth.client.LBRYAPIClient.config will detect if
it needs to return the auth/non-auth version
|
2016-10-26 03:16:33 -04:00 |
|
|
Job Evers-Meltzer
|
a5797cdeb3
|
Better handling of lbry file search
- replace lbry file search strings with constants
- refactor repeated code for deciding what search type to use
|
2016-10-20 16:01:54 -07: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 |
|
|
Job Evers-Meltzer
|
078b254d1d
|
rename files to remove LBRY prefix
|
2016-09-25 18:11:23 -07:00 |
|