6 commits

Author	SHA1	Message	Date
Job Evers-Meltzer	862055a6de	move settings into conf file	2016-10-27 14:31:27 -05:00
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	f9f07c47e2	move analytics manager	2016-10-20 11:28:05 -07:00
Job Evers-Meltzer	d0a82c68df	move analytics related calls into their own class	2016-10-20 11:25:17 -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
Job Evers	9a738c3783	Add basic analytics api and heartbeat event	2016-08-12 13:37:26 -05:00