Merge branch 'master' into catalyst

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

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

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});

templates/static/about.xhtml

@@ -130,6 +130,16 @@
     </div>
   </div>
   
+  <div class="NB-module">
+    <h5 class="NB-module-title"><span class="NB-module-title-prefix">Legal:</span> Privacy Policy &amp; Terms of Service</h5>
+    <div class="NB-module-content">
+      <ul class="NB-about-tagline">
+        <li><a href="/privacy">Privacy policy</a> lets you know that your data is yours alone</li>
+        <li><a href="/tos">Terms of service</a> is what it takes to legally use NewsBlur</li>
+      </ul>
+    </div>
+  </div>
+  
   <div class="NB-module">
     <h5 class="NB-module-title"><span class="NB-module-title-prefix">What:</span> NewsBlur's Tagline</h5>
     <div class="NB-module-content">