Merge branch 'release/0.7.10.0'v0.7.10.0

14 files changed, 62 insertions, 6 deletions

diff --git a/Changelog.md b/Changelog.md
index 3d6a74023..96f44e5b6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,11 @@
+# 0.7.10.0
+
+## Refactor
+* Replace dandelion.jpg with a public domain photo [#7976](https://github.com/diaspora/diaspora/pull/7976)
+
+## Bug fixes
+* Fix incorrect post sorting on tag streams and tag searches for tags containing the word "activity" [#7959](https://github.com/diaspora/diaspora/issues/7959)
+
 # 0.7.9.0
 
 ## Refactor
diff --git a/app/assets/images/dandelion.jpg b/app/assets/images/dandelion.jpg
index 5766b5840..3ec3e43cd 100644
--- a/app/assets/images/dandelion.jpg
+++ b/app/assets/images/dandelion.jpg
diff --git a/app/assets/javascripts/app/models/stream.js b/app/assets/javascripts/app/models/stream.js
index 119107144..3b12f470f 100644
--- a/app/assets/javascripts/app/models/stream.js
+++ b/app/assets/javascripts/app/models/stream.js
@@ -69,7 +69,7 @@ app.models.Stream = Backbone.Collection.extend({
   },
 
   sortOrder : function() {
-    return /activity/.test(this.basePath()) ? "interactedAt" : "createdAt";
+    return /^\/activity/.test(this.basePath()) ? "interactedAt" : "createdAt";
   },
 
   /* This function is for adding a large number of posts one by one.
diff --git a/config/defaults.yml b/config/defaults.yml
index 8bef03ea4..596615fdc 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -4,7 +4,7 @@
 
 defaults:
   version:
-    number: "0.7.9.0" # Do not touch unless doing a release, do not backport the version number that's in master
+    number: "0.7.10.0" # Do not touch unless doing a release, do not backport the version number that's in master
   heroku: false
   environment:
     url: "http://localhost:3000/"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index d6d51ab1b..662b22e6a 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -645,6 +645,7 @@ de:
       public_feed: "Öffentlicher diaspora* Feed von %{name}"
       source_package: "Quelltextpaket runterladen"
       statistics_link: "Pod-Statistiken"
+      switch_to_touch_optimized_mode: "Wechseln zum touch-optimierten Modus"
       whats_new: "Was gibt’s Neues?"
     header:
       code: "Code"
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index 154ead78e..e67346183 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -86,12 +86,14 @@ ja:
       week: "週"
     user_entry:
       account_closed: "削除されたアカウント"
+      admin: "管理者"
       diaspora_handle: "ダイアスポラ* ハンドル"
       email: "メール"
       guid: "GUID"
       id: "ID"
       invite_token: "招待トークン"
       last_seen: "最後に参照"
+      moderator: "モデレーター"
       ? "no"
       : いいえ
       nsfw: "#nsfw"
@@ -102,14 +104,23 @@ ja:
       account_closing_scheduled: "%{name} のアカウントは削除される予定です。これはすぐに処理されます..."
       account_locking_scheduled: "%{name} のアカウントはロックされる予定です。これはすぐに処理されます..."
       account_unlocking_scheduled: "%{name} のアカウントはロック解除される予定です。これはすぐに処理されます..."
+      add_admin: "%{name} さんは管理者に指定された。"
       add_invites: "招待を追加"
+      add_moderator: "%{name} さんはモデレータとして指名された"
       are_you_sure: "このアカウントを削除してもよろしいですか？"
       are_you_sure_lock_account: "このアカウントをロックしてもよろしいですか？"
       are_you_sure_unlock_account: "このアカウントのロックを解除してもよろしいですか？"
       close_account: "アカウントを削除する"
+      delete_admin: "%{name} さんは管理者から外された。"
+      delete_moderator: "%{name} さんはモデレータから外された"
+      does_not_exist: "そのユーザは存在しません。"
       email_to: "招待のメール"
       invite: "招待"
       lock_account: "アカウントをロックする"
+      make_admin: "このユーザーを管理者に指名する"
+      make_moderator: "このユーザーをモデレーターに指名する"
+      remove_admin: "このユーザーを管理者から外す"
+      remove_moderator: "このユーザーをモデレーターから外す"
       under_13: "13歳以下のユーザーに表示する (COPPA)"
       unlock_account: "アカウントのロックを解除する"
       users:
@@ -183,6 +194,7 @@ ja:
         tos: "アプリケーションの利用規約を参照"
   are_you_sure: "本当にいいですか。"
   are_you_sure_delete_account: "本当にアカウントを削除しますか? この操作を取り消すことはできません！"
+  are_you_sure_ignore_user: "このユーザーは無視されます。本当にいいですか。"
   aspect_memberships:
     destroy:
       failure: "連絡先をアスペクトから除外するのに失敗しました。"
@@ -619,6 +631,8 @@ ja:
       public_feed: "%{name}さんの公開ダイアスポラフィード"
       source_package: "ソースコードのパッケージをダウンロードする"
       statistics_link: "ポッドの統計"
+      switch_to_standard_mode: "標準モードに切り替え"
+      switch_to_touch_optimized_mode: "タッチ操作モードに切り替え"
       whats_new: "更新履歴"
     header:
       code: "ソース"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 4aa1af042..905c17450 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -60,6 +60,7 @@ ro:
         zero: "%{count} utilizatori"
       week: "Săptămână"
     user_search:
+      add_invites: "Adaugă invitații"
       invite: "Invită"
       users:
         few: "am găsit %{count} utilizatori"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 894d37943..c27ab46a4 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -86,15 +86,18 @@ zh-TW:
       week: "一個禮拜"
     user_entry:
       account_closed: "帳號已經關閉"
+      admin: "管理員"
       diaspora_handle: "disaspora* 識別碼"
       email: "電子信箱"
       guid: "全域唯一識別碼(GUID)"
       id: "識別碼"
       invite_token: "邀請信物"
       last_seen: "最後看見時間"
+      moderator: "協調人"
       ? "no"
       : 否
       nsfw: "上班時不宜(#nsfw)"
+      spotlight: "焦點人物"
       unknown: "不知道"
       ? "yes"
       : 是
@@ -102,14 +105,29 @@ zh-TW:
       account_closing_scheduled: "%{name} 這個帳號已經排定要關閉了。過一段時間後就會被執行了..."
       account_locking_scheduled: "%{name} 這個帳號已經排定要上鎖了。過一段時間後就會被執行了..."
       account_unlocking_scheduled: "%{name} 這個帳號已經排定要解鎖了。過一段時間後就會被執行了..."
+      add_admin: "給予 %{name} 管理員身份了。"
       add_invites: "增加邀請次數"
+      add_moderator: "給予 %{name} 協調人身份了。"
+      add_spotlight: "%{name} 被給予社群焦點人物身份了。"
       are_you_sure: "確定要關閉這個帳號嗎？"
       are_you_sure_lock_account: "你確定要把帳號上鎖嗎？"
       are_you_sure_unlock_account: "你確定要把帳號解鎖嗎？"
       close_account: "關閉帳號"
+      delete_admin: "把 %{name} 從管理員列表中移除了。"
+      delete_moderator: "把 %{name} 從協調人列表中移除了。"
+      delete_spotlight: "把 %{name} 從社群焦點人物列表中移除了。"
+      does_not_exist: "使用者不存在！"
       email_to: "寄電子郵件邀請"
       invite: "邀請"
       lock_account: "鎖定帳號"
+      make_admin: "給予管理員身份"
+      make_moderator: "給予協調人身份"
+      make_spotlight: "給予社群焦點人物身份"
+      remove_admin: "移除管理員身份"
+      remove_moderator: "移除協調人身份"
+      remove_spotlight: "移除社群焦點人物身份"
+      role_implemented: "已經給予 %{name} 這種身份了！"
+      role_removal_implemented: "%{name} 已經沒有這種身份了！"
       under_13: "顯示低於 13 歲的使用者(基於美國兒童網路隱私保護法案, COPPA)"
       unlock_account: "解鎖帳號"
       users:
@@ -183,6 +201,7 @@ zh-TW:
         tos: "檢視這個應用程式的服務條款"
   are_you_sure: "確定嗎？"
   are_you_sure_delete_account: "確定要關閉帳號嗎？帳號無法復原喔！"
+  are_you_sure_ignore_user: "確定要忽視這個使用者嗎？"
   aspect_memberships:
     destroy:
       failure: "從社交面中移除聯絡人失敗"
@@ -619,6 +638,8 @@ zh-TW:
       public_feed: "%{name} 在 diaspora* 的公開資訊源"
       source_package: "下載源碼封裝檔"
       statistics_link: "豆莢統計資料"
+      switch_to_standard_mode: "切換到標準模式"
+      switch_to_touch_optimized_mode: "切換到觸控模式"
       whats_new: "更新了什麼？"
     header:
       code: "源碼"
@@ -1162,8 +1183,9 @@ zh-TW:
       new_password: "新的密碼"
       private_message: "收到私人訊息"
       protocol_handler:
-        description: "按下這個按鈕會要求你的瀏覽器把我們註冊為 web+diaspora:// 鏈結的處理者，未來就會在你註冊的豆莢開啟這種鏈結。這個功能目前還在實驗階段，效果如何取決於瀏覽器如何支援。"
-        register: "註冊"
+        browser: "這個網路協定目前還在實驗階段，是否能夠成功的使用要取決於你所使用的瀏覽器的支援。請用瀏覽器的網路協定處理器設定來管理或移除這個處理器。下列的按鈕會一直都在，你必須要對每個你所使用的瀏覽器都設定一次。"
+        description: "我們引進了 web+diaspora:// 這個新的網路協定。目的是要在外部網站上，只要是使用了這種協定的網址，都可以連結到你所註冊的 diaspora* 豆莢上的對應頁面。請按下以下按鈕來設定你的瀏覽器，就可以使用 %{pod_url} 來識別外部的 web+diaspora:// 連結。"
+        register: "註冊瀏覽器的 web+diaspora:// 處理器"
         title: "web+diaspora:// 鏈結的通訊協定處理者"
       receive_email_notifications: "接收電子郵件通知的時機："
       request_export: "申請下載個人檔案資料"
diff --git a/config/locales/javascript/javascript.ja-KS.yml b/config/locales/javascript/javascript.ja-KS.yml
index d8528676d..163d8c231 100644
--- a/config/locales/javascript/javascript.ja-KS.yml
+++ b/config/locales/javascript/javascript.ja-KS.yml
@@ -10,6 +10,7 @@ ja-KS:
       post_something: "ダイアスポラにつぶやく"
     cancel: "やめとく"
     confirm_dialog: "ほんまにええの？"
+    delete: "ほかす"
     people:
       not_found: "…1人も見つからへんかった"
     reshares:
diff --git a/config/locales/javascript/javascript.ja.yml b/config/locales/javascript/javascript.ja.yml
index 772b5f1ae..2ef3f4121 100644
--- a/config/locales/javascript/javascript.ja.yml
+++ b/config/locales/javascript/javascript.ja.yml
@@ -129,6 +129,7 @@ ja:
       recent_notifications: "最近の通知"
       search: "検索"
       settings: "設定"
+      switch_to_touch_optimized_mode: "タッチ操作モードに切り替え"
       toggle_navigation: "ナビゲーションの切り替え"
       view_all: "全て見る"
     hide_post: "この投稿を非表示にしますか？"
diff --git a/config/locales/javascript/javascript.zh-TW.yml b/config/locales/javascript/javascript.zh-TW.yml
index 413ab5a8a..18df9c545 100644
--- a/config/locales/javascript/javascript.zh-TW.yml
+++ b/config/locales/javascript/javascript.zh-TW.yml
@@ -129,6 +129,7 @@ zh-TW:
       recent_notifications: "最新消息"
       search: "搜尋"
       settings: "設定"
+      switch_to_touch_optimized_mode: "切換到觸控模式"
       toggle_navigation: "瀏覽模式切換"
       view_all: "看全部"
     hide_post: "要隱藏貼文嗎？"
diff --git a/graphics/README.md b/graphics/README.md
index 0687353c7..f432b108a 100644
--- a/graphics/README.md
+++ b/graphics/README.md
@@ -6,4 +6,4 @@ frontend (PNGs, etc.).  They can be scaled, tinted, shaded, etc.
 
 ## License
 
-[dandelion.jpg](https://www.flickr.com/photos/pixagraphic/7218285148/) by pixagraphic has been released under [CC-BY-ND](https://creativecommons.org/licenses/by-nd/2.0/)
+[dandelion.jpg](https://www.dreamstime.com/dandelion-blowing-wind-public-domain-image-free-83023111) is a public domain (CC0) photo by creativecommonsstockphotos.
diff --git a/graphics/dandelion.jpg b/graphics/dandelion.jpg
index f406ddc5e..dffa84289 100644
--- a/graphics/dandelion.jpg
+++ b/graphics/dandelion.jpg
diff --git a/spec/javascripts/app/models/stream_spec.js b/spec/javascripts/app/models/stream_spec.js
index e107a0d52..bea72ea71 100644
--- a/spec/javascripts/app/models/stream_spec.js
+++ b/spec/javascripts/app/models/stream_spec.js
@@ -27,7 +27,7 @@ describe("app.models.Stream", function() {
     });
 
     it("returns a comparator for posts that compares interacted_at and ids for the activity stream", function() {
-      spyOn(stream, "basePath").and.returnValue("activity");
+      spyOn(stream, "basePath").and.returnValue("/activity");
       this.options = stream.collectionOptions();
       expect(this.options.comparator(this.post1, this.post2)).toBe(1);
       expect(this.options.comparator(this.post2, this.post1)).toBe(-1);
@@ -37,6 +37,13 @@ describe("app.models.Stream", function() {
       expect(this.options.comparator(this.post4, this.post1)).toBe(1);
       expect(this.options.comparator(this.post1, this.post1)).toBe(0);
     });
+
+    it("returns a comparator for posts that compares created_at and ids for tags including 'activity'", function() {
+      spyOn(stream, "basePath").and.returnValue("/tags/foo-activity-bar");
+      this.options = stream.collectionOptions();
+      expect(this.options.comparator(this.post2, this.post3)).toBe(1);
+      expect(this.options.comparator(this.post3, this.post2)).toBe(-1);
+    });
   });
 
   describe("#_fetchOpts", function() {