Jack
|
6799de645b
|
Merge branch 'master' into refactor-settings
# Conflicts:
# packaging/osx/lbry-osx-app/lbrygui/LBRYApp.py
# packaging/windows/lbry-win32-app/LBRYWin32App.py
|
2016-10-19 00:19:45 -04: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
|
b5311dd1c3
|
fix DaemonRequest import in apps
|
2016-10-14 23:01:15 -04:00 |
|
Jack
|
c4eb3de5b2
|
update app imports
|
2016-09-30 11:17:47 -04:00 |
|
Jack
|
a99dc6e93d
|
add LBRYDaemonRequest to os x app
|
2016-08-09 11:19:01 -04:00 |
|
Jack
|
df3c5b9a77
|
open conf for write in app
|
2016-07-04 20:47:43 -04:00 |
|
Jack
|
69c5631b25
|
make lbrycrddpath.conf if it doesnt exist, point to binary in app
|
2016-07-04 19:53:01 -04:00 |
|
Job Evers-Meltzer
|
628d052749
|
move contents of lbry-osx-app into lbry repo
|
2016-06-20 20:43:48 -05:00 |
|