Merge branch 'master' into reflector

This commit is contained in:
Jack 2016-08-18 22:42:27 -04:00
commit 7100345a09
5 changed files with 6 additions and 4 deletions

View file

@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.3.18
current_version = 0.3.19
commit = True
tag = True
message = Bump version: {current_version} -> {new_version}

View file

@ -1,2 +1,2 @@
__version__ = "0.3.18"
__version__ = "0.3.19"
version = tuple(__version__.split('.'))

View file

@ -361,6 +361,7 @@ class LBRYDaemon(jsonrpc.JSONRPC):
self.version_checker = LoopingCall(self._check_remote_versions)
self.connection_problem_checker = LoopingCall(self._check_connection_problems)
self.pending_claim_checker = LoopingCall(self._check_pending_claims)
self.send_heartbeat = LoopingCall(self._send_heartbeat)
# self.lbrynet_connection_checker = LoopingCall(self._check_lbrynet_connection)
self.sd_identifier = StreamDescriptorIdentifier()
@ -534,7 +535,6 @@ class LBRYDaemon(jsonrpc.JSONRPC):
def _load_analytics_api(self):
self.analytics_api = analytics.Api.load()
self.send_heartbeat = LoopingCall(self._send_heartbeat)
self.send_heartbeat.start(60)
def _send_heartbeat(self):

View file

@ -226,6 +226,8 @@ class LBRYindex(resource.Resource):
return resource.Resource.getChild(self, name, request)
def render_GET(self, request):
request.setHeader('cache-control','no-cache, no-store, must-revalidate')
request.setHeader('expires', '0')
return static.File(os.path.join(self.ui_dir, "index.html")).render_GET(request)

View file

@ -1,5 +1,5 @@
[Desktop Entry]
Version=0.3.18
Version=0.3.19
Name=LBRY
Comment=The world's first user-owned content marketplace
Icon=lbry