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 |
|
Job Evers-Meltzer
|
76fb7697ff
|
misc
|
2016-10-20 11:28:05 -07:00 |
|
Job Evers-Meltzer
|
3a91896d8a
|
track the amount of data uploaded
|
2016-10-20 11:28:05 -07:00 |
|
Jack
|
06a88599df
|
--http-auth flag to use authentication, refactor settings
settings will prefer, in order:
-defaults
-settings in config file
-settings given as environmental variables
-settings given as command line args
|
2016-10-19 00:12:44 -04:00 |
|
Jack
|
19c2264429
|
clean up
|
2016-10-13 13:35:55 -04: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 |
|