diff --git a/apps/reader/views.py b/apps/reader/views.py index b9b147047..557c9e27d 100644 --- a/apps/reader/views.py +++ b/apps/reader/views.py @@ -86,7 +86,7 @@ ALLOWED_SUBDOMAINS = [ def get_subdomain(request): host = request.META.get('HTTP_HOST') - if host and host.count(".") == 2: + if host and host.count(".") >= 2: return host.split(".")[0] else: return None diff --git a/docker-compose.yml b/docker-compose.yml index 735e43874..faf2f7b5c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -136,6 +136,7 @@ services: db_mongo: container_name: db_mongo image: mongo:4.0 + user: mongodb restart: unless-stopped ports: - 29019:29019 diff --git a/media/js/newsblur/views/feed_title_view.js b/media/js/newsblur/views/feed_title_view.js index be12dc7b6..4a6979a4f 100644 --- a/media/js/newsblur/views/feed_title_view.js +++ b/media/js/newsblur/views/feed_title_view.js @@ -321,7 +321,8 @@ NEWSBLUR.Views.FeedTitleView = Backbone.View.extend({ e.preventDefault(); e.stopPropagation(); - if (this.model.get('has_exception') && this.model.get('exception_type') == 'feed') { + if (NEWSBLUR.reader.get_unread_view_name() != "starred" && + (this.model.get('has_exception') && this.model.get('exception_type') == 'feed')) { NEWSBLUR.reader.open_feed_exception_modal(this.model.id); } else if (this.model.is_search()) { NEWSBLUR.reader.open_saved_search({search_model: this.model, $feed: this.$el}); diff --git a/templates/static/about.xhtml b/templates/static/about.xhtml index e5fb8d0fb..dc2ac2fbc 100644 --- a/templates/static/about.xhtml +++ b/templates/static/about.xhtml @@ -130,6 +130,16 @@ +