Merge branch 'master' of https://github.com/NodeBB/NodeBB

install/package.json

@@ -90,9 +90,9 @@
         "nodebb-plugin-spam-be-gone": "0.7.1",
         "nodebb-rewards-essentials": "0.1.3",
         "nodebb-theme-lavender": "5.0.11",
-        "nodebb-theme-persona": "10.1.51",
+        "nodebb-theme-persona": "10.1.53",
         "nodebb-theme-slick": "1.2.29",
-        "nodebb-theme-vanilla": "11.1.26",
+        "nodebb-theme-vanilla": "11.1.28",
         "nodebb-widget-essentials": "4.1.0",
         "nodemailer": "^6.4.6",
         "passport": "^0.4.1",

public/language/ar/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "مشاهدة الملف الشخصي",
 	"start-new-chat": "بدء محادثه جديده",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "حذف المشاركة",
 	"purge-post": "Purge Post",
 	"restore-post": "استرجاع المشاركة",

public/language/ar/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/bg/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Преглед на профила",
 	"start-new-chat": "Започване на нов разговор",
 	"go-to-target": "Преглед на целта на доклада",
+	"assign-to-me": "Назначаване на мен",
 	"delete-post": "Изтриване на публикацията",
 	"purge-post": "Изчистване на публикацията",
 	"restore-post": "Възстановяване на публикацията",

public/language/bg/topic.json

@@ -134,10 +134,13 @@
     "stale.reply_anyway": "Отговаряне в тази тема въпреки това",
     "link_back": "Отговор: [%1](%2)",
     "diffs.title": "История на редакциите",
-    "diffs.description": "Тази публикация има <strong>%1</strong> варианта. Щракнете върху някоя от версиите по-долу, за да видите съдържанието ѝ в съответния момент.",
+    "diffs.description": "Тази публикация има <strong>%1</strong> версии. Щракнете върху някоя от версиите по-долу, за да видите съдържанието ѝ в съответния момент.",
-    "diffs.no-revisions-description": "Тази публикация има <strong>%1</strong> варианта.",
+    "diffs.no-revisions-description": "Тази публикация има <strong>%1</strong> версии.",
     "diffs.current-revision": "текуща версия",
     "diffs.original-revision": "оригинална версия",
+    "diffs.restore": "Възстановяване на тази версия",
+    "diffs.restore-description": "Към историята на редакциите на тази публикация ще бъде добавена нова версия.",
+    "diffs.post-restored": "Публикацията е възстановена успешно до по-ранна версия",
     "timeago_later": "%1 по-късно",
     "timeago_earlier": "%1 по-рано"
 }

public/language/bn/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/bn/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/cs/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Zobrazit profil",
 	"start-new-chat": "Začít novou konverzaci",
 	"go-to-target": "Zobrazit cílové označení",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/cs/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "Tento příspěvek má <strong>%1</strong> změn.",
     "diffs.current-revision": "aktuální revize",
     "diffs.original-revision": "originální revize",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 později",
     "timeago_earlier": "%1 dříve"
 }

public/language/da/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/da/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/de/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Profil ansehen",
 	"start-new-chat": "Neuen Chat beginnen",
 	"go-to-target": "Meldungsziel ansehen",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/de/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "Dieser Beitrag ha <strong>%1</strong> Revisionen.",
     "diffs.current-revision": "Aktuelle Revision",
     "diffs.original-revision": "Ursprüngliche Revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 später",
     "timeago_earlier": "%1 earlier"
 }

public/language/el/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/el/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/en-GB/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",
@@ -44,7 +45,6 @@
 	"no-notes": "No shared notes.",
 
 	"history": "Account & Flag History",
-	"back": "Back to Flags List",
 	"no-history": "No flag history.",
 
 	"state-all": "All states",

public/language/en-US/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/en-US/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/en-x-pirate/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/en-x-pirate/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/es/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Ver perfil",
 	"start-new-chat": "Empezar nuevo chat",
 	"go-to-target": "Ver objetivo marcado",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/es/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "Este post ha tenido <strong>%1</strong> revisión(es).",
     "diffs.current-revision": "revisión actual",
     "diffs.original-revision": "revisión original",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 después",
     "timeago_earlier": "%1 antes"
 }

public/language/et/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/et/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/fa-IR/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "نمایش پروفایل",
 	"start-new-chat": "شروع چت جدید",
 	"go-to-target": "مشاهده محتوای گزارش شده",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/fa-IR/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "این پست %1 نسخه دارد.",
     "diffs.current-revision": "نسخه فعلی",
     "diffs.original-revision": "نسخه اصلی",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/fi/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/fi/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "Tästä viestistä on <strong>%1 </strong>versiota",
     "diffs.current-revision": "nykyinen versio",
     "diffs.original-revision": "alkuperäinen versio",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 myöhempi",
     "timeago_earlier": "%1 aiempi"
 }

public/language/fr/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Voir le profil",
 	"start-new-chat": "Démarrer un nouveau Chat",
 	"go-to-target": "Voir le signalement cible",
+	"assign-to-me": "Me l'assigner",
 	"delete-post": "Supprimer les messages",
 	"purge-post": "Supprimer définitivement",
 	"restore-post": "Restaurer les messages",

public/language/fr/global.json

@@ -30,7 +30,7 @@
     "header.unread": "Non lus",
     "header.tags": "Mots-clés",
     "header.popular": "Populaire",
-    "header.top": "Top",
+    "header.top": "Haut",
     "header.users": "Utilisateurs",
     "header.groups": "Groupes",
     "header.chats": "Discussions",

public/language/fr/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "Cet article a <strong>%1</strong> révisions.",
     "diffs.current-revision": "Révision en cours",
     "diffs.original-revision": "Révision originale",
+    "diffs.restore": "Restaurer cette révision",
+    "diffs.restore-description": "Une nouvelle révision sera ajoutée à l'historique des modifications de ce message.",
+    "diffs.post-restored": "Restauration avec succès dans une révision antérieure",
     "timeago_later": "%1",
     "timeago_earlier": "il y a %1"
 }

public/language/gl/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Ver perfil",
 	"start-new-chat": "Comezar novo chat",
 	"go-to-target": "Ver contido marcado",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/gl/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/he/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "צפה בפרופיל",
 	"start-new-chat": "התחל שיחה חדשה",
 	"go-to-target": "צפה במטרת הסימון",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/he/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "לפוסט זה יש <strong>%1</strong>גרסאות",
     "diffs.current-revision": "גירסה נוכחית",
     "diffs.original-revision": "גירסה מקורית",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "אחרי %1:",
     "timeago_earlier": "לפני %1 "
 }

public/language/hr/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Pogledaj profil",
 	"start-new-chat": "Pokreni novi razgovor",
 	"go-to-target": "Pogledaj metu zastave",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/hr/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/hu/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Profil megtekintése",
 	"start-new-chat": "Új chat indítása",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/hu/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/id/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/id/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/it/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Vedi Profilo",
 	"start-new-chat": "Inizia Nuova Chat",
 	"go-to-target": "Visualizza oggetto segnalazione",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Elimina post",
 	"purge-post": "Elimina Post",
 	"restore-post": "Ripristina post",

public/language/it/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "Questo post ha <strong>%1</strong> revisioni.",
     "diffs.current-revision": "revisione corrente",
     "diffs.original-revision": "revisione originale",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 successivo",
     "timeago_earlier": "%1 precedente"
 }

public/language/ja/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "プロフィールを見る",
 	"start-new-chat": "新しいチャットを開始",
 	"go-to-target": "フラグのターゲットを表示",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/ja/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "現在のリビジョン",
     "diffs.original-revision": "元のリビジョン",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/ko/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "프로필 보기",
 	"start-new-chat": "새로운 채팅 시작",
 	"go-to-target": "신고된 게시물 바로가기",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/ko/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "이 게시글에는 <strong>%1</strong>번의 수정이 있습니다.",
     "diffs.current-revision": "현재 리비젼",
     "diffs.original-revision": "원래의 리비젼",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/lt/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/lt/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/lv/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Skatīt profilu",
 	"start-new-chat": "Sākt jaunu sarunu",
 	"go-to-target": "Skatīt atzīmēto rakstu",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/lv/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "Šim rakstam ir %1 versijas.",
     "diffs.current-revision": "pašreizējā versija",
     "diffs.original-revision": "sākotnējā versija",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/ms/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/ms/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/nb/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/nb/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/nl/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Profiel bekijken",
 	"start-new-chat": "Begin een nieuwe chat",
 	"go-to-target": "Bekijk markering doel",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/nl/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "Dit bericht heeft <strong>%1</strong> revisies.",
     "diffs.current-revision": "Huidige revisie",
     "diffs.original-revision": "Oorspronkelijke revisie",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 eerder"
 }

public/language/pl/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Zobacz profil",
 	"start-new-chat": "Rozpocznij nowy czat",
 	"go-to-target": "Zobacz cel flagowania",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Usuń post",
 	"purge-post": "Wyczyść post",
 	"restore-post": "Przywróć post",

public/language/pl/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "Ten post zawiera <strong>%1</strong> zmian.",
     "diffs.current-revision": "wersja obecna",
     "diffs.original-revision": "pierwsza zmiana",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 później",
     "timeago_earlier": "%1 wcześniej"
 }

public/language/pt-BR/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Ver Perfil",
 	"start-new-chat": "Iniciar Novo Chat",
 	"go-to-target": "Ver o Sinalizado",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/pt-BR/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "Este post foi revisado <strong>%1</strong> vezes.",
     "diffs.current-revision": "revisão atual",
     "diffs.original-revision": "revisão original",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 depois",
     "timeago_earlier": "%1 earlier"
 }

public/language/pt-PT/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Ver Perfil",
 	"start-new-chat": "Iniciar Nova Conversa",
 	"go-to-target": "Ver Alvo da Denúncia",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/pt-PT/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "revisão atual",
     "diffs.original-revision": "revisão original",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 depois",
     "timeago_earlier": "%1 antes"
 }

public/language/ro/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/ro/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/ru/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Просмотреть профиль",
 	"start-new-chat": "Начать новый чат",
 	"go-to-target": "Показать предмет жалобы",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/ru/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "У этого сообщения есть <strong>%1</strong>версий",
     "diffs.current-revision": "текущая версия",
     "diffs.original-revision": "исходная версия",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "через %1",
     "timeago_earlier": "на %1 раньше"
 }

public/language/rw/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/rw/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/sc/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/sc/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/sk/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Zobraziť profil",
 	"start-new-chat": "Začať novú konverzáciu",
 	"go-to-target": "Zobraziť cieľové označenie",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/sk/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "Tento príspevok má <strong>%1</strong> zmien.",
     "diffs.current-revision": "aktuálna revízia",
     "diffs.original-revision": "originálna revízia",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/sl/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/sl/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "This post has <strong>%1</strong> revisions.",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/sr/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Погледај профил",
 	"start-new-chat": "Започни ново ћаскање",
 	"go-to-target": "Погледај циљ означавања",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/sr/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "Ова порука има %1 корекција.",
     "diffs.current-revision": "тренутна корекција",
     "diffs.original-revision": "оригинална корекција",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 касније",
     "timeago_earlier": "%1 раније"
 }

public/language/sv/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Visa profil",
 	"start-new-chat": "Påbörja ny chatt",
 	"go-to-target": "Visa flaggans ämne",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/sv/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "Detta inlägg har <strong>%1</strong> revisioner.",
     "diffs.current-revision": "Nuvarande revision",
     "diffs.original-revision": "Ursprunglig revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 senare",
     "timeago_earlier": "%1 tidigare"
 }

public/language/th/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "ดูโปรไฟล์",
 	"start-new-chat": "เริ่มแชทใหม่",
 	"go-to-target": "ดูเป้าหมายการปักธง",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/th/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "โพสนี้มี <strong>%1</strong>การแก้ไข",
     "diffs.current-revision": "current revision",
     "diffs.original-revision": "original revision",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

public/language/tr/admin/manage/users.json

@@ -12,9 +12,9 @@
 	"unban": "Kullanıcı(n/lar)ın Yasağını Kaldır",
 	"reset-lockout": "Kilitlemeyi Sıfırla",
 	"reset-flags": "Bayrakları Sıfırla",
-	"delete": "Delete <strong>User(s)</strong>",
+	"delete": " <strong>Kullanıcı(ları)</strong> Sil",
-	"delete-content": "Delete User(s) <strong>Content</strong>",
+	"delete-content": "Kullanıcı <strong>İçeriğini</strong> Sil",
-	"purge": "Delete <strong>User(s)</strong> and <strong>Content</strong>",
+	"purge": "<strong>Kullanıcıyı/ları</strong> ve <strong>İçeriği</strong> Sil",
 	"download-csv": "CSV İndir",
 	"manage-groups": "Grupları Düzenle",
 	"add-group": "Grup ekle",

public/language/tr/admin/settings/advanced.json

@@ -20,7 +20,7 @@
 	"hsts.preload": "HSTS üst bilgisinin ön yüklemesine izin ver",
 	"hsts.help": "Etkinleştirildiğinde, bu site için bir HSTS başlığı ayarlanır. Alt alanları ve önyükleme bayraklarını dahil etmeyi seçebilirsiniz. Kararsızsanız, bu alanı işaretlenmemiş olarak bırakabilirsiniz. <a href=\"%1\">Daha fazla bilgi <i class=\"fa fa-external-link\"></i></a>",
 	"traffic-management": "Trafik Yönetimi",
-	"traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.",
+	"traffic.help": "NodeBB, yoğun trafik isteklerini otomatik olarak reddeden bir modül ile donatılmıştır. Varsayıla ayarlar başlangıç için yeterli olsa da, bu ayarları buradan düzenleyebilirsiniz.",
 	"traffic.enable": "Trafik Yönetimini Etkinleştir",
 	"traffic.event-lag": "Olay Döngüsü Gecikme Eşiği (milisaniye cinsinden)",
 	"traffic.event-lag-help": "Bu değeri düşürmek, sayfa yüklemeleri için bekleme sürelerini azaltır, ancak daha fazla kullanıcıya \"aşırı yükleme\" mesajını da gösterir. (Yeniden başlatmak gerekir)",

public/language/tr/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "Profili Gör",
 	"start-new-chat": "Yeni Sohbet Başlat",
 	"go-to-target": "Şikayet Edilen İçeriği Gör",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "İletiyi Sil",
 	"purge-post": "İletiyi Temizle",
 	"restore-post": "İletiyi Geri Getir",

public/language/tr/global.json

@@ -30,7 +30,7 @@
     "header.unread": "Okunmamış",
     "header.tags": "Etiketler",
     "header.popular": "Popüler",
-    "header.top": "Top",
+    "header.top": "Zirve",
     "header.users": "Kullanıcılar",
     "header.groups": "Gruplar",
     "header.chats": "Sohbetler",

public/language/tr/topic.json

@@ -99,11 +99,11 @@
     "fork_pid_count": "%1 ileti(ler) seçildi",
     "fork_success": "Başlık başarıyla ayrıldı! Yeni başlığı görüntülemek için tıklayınız!",
     "delete_posts_instruction": "Silmek/temizlemek istediğiniz iletileri seçiniz!",
-    "merge_topics_instruction": "Click the topics you want to merge or search for them",
+    "merge_topics_instruction": "Birleştirmek istediğiniz başlıkları seçiniz veya onları arayınız!",
-    "merge-topic-list-title": "List of topics to be merged",
+    "merge-topic-list-title": "Birleştirilecek başlık listesi",
-    "merge-options": "Merge options",
+    "merge-options": "Birleştirme Seçenekleri",
-    "merge-select-main-topic": "Select the main topic",
+    "merge-select-main-topic": "Ana başlığı seçiniz",
-    "merge-new-title-for-topic": "New title for topic",
+    "merge-new-title-for-topic": "Konu için yeni başlık",
     "move_posts_instruction": "Taşımak istediğiniz iletileri seçiniz!",
     "change_owner_instruction": "Başka kullanıcıya aktarmak istediğiniz iletileri seçiniz!",
     "composer.title_placeholder": "Başlık ismini buraya giriniz...",
@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "Bu iletinin <strong>%1</strong> revizyonu var.",
     "diffs.current-revision": "mevcut revizyon",
     "diffs.original-revision": "orijinal revizyon",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 sonra",
     "timeago_earlier": "%1 önce"
 }

public/language/tr/user.json

@@ -13,15 +13,15 @@
     "ban_account_confirm": "Hesabı yasaklamak istediğinizden emin misiniz?",
     "unban_account": "Hesabın Yasağını Kaldır",
     "delete_account": "Hesabı Sil",
-    "delete_account_as_admin": "Delete <strong>Account</strong>",
+    "delete_account_as_admin": "<strong>Hesabı</strong> Sil",
-    "delete_content": "Delete Account <strong>Content</strong>",
+    "delete_content": "Hesabın <strong>İçeriğini</strong> Sil",
-    "delete_all": "Delete <strong>Account</strong> and <strong>Content</strong>",
+    "delete_all": "<strong>Hesabı</strong> ve <strong>İçeriğini</strong> Sil",
     "delete_account_confirm": "Are you sure you want to anonymize your posts and delete your account?<br /><strong>This action is irreversible and you will not be able to recover any of your data</strong><br /><br />Enter your password to confirm that you wish to destroy this account.",
     "delete_this_account_confirm": "Are you sure you want to delete this account while leaving its contents behind?<br /><strong>This action is irreversible, posts will be anonymized, and you will not be able to restore post associations with the deleted account</strong><br /><br />",
     "delete_account_content_confirm": "Are you sure you want to delete this account's content (posts/topics/uploads)? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
     "delete_all_confirm": "Are you sure you want to delete this account and all of its content (posts/topics/uploads)? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
     "account-deleted": "Hesap silindi",
-    "account-content-deleted": "Account content deleted",
+    "account-content-deleted": "Hesaba ait içerik silindi",
     "fullname": "İsim Soyisim",
     "website": "İnternet Sitesi",
     "location": "Konum",

public/language/uk/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "Цей пост має <strong>%1</strong> версій.",
     "diffs.current-revision": "поточна ревізія",
     "diffs.original-revision": "початкова ревізія",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 пізніше",
     "timeago_earlier": "%1 раніше"
 }

public/language/vi/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "View Profile",
 	"start-new-chat": "Start New Chat",
 	"go-to-target": "View Flag Target",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/vi/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "Bài viết này có <strong>%1</strong> sửa đổi",
     "diffs.current-revision": "Bản sao lưu hiện tại",
     "diffs.original-revision": "Bản sao lưu gốc",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 sau",
     "timeago_earlier": "%1 earlier"
 }

public/language/zh-CN/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "查看个人资料",
 	"start-new-chat": "开始新会话",
 	"go-to-target": "查看举报目标",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",

public/language/zh-CN/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "该贴已重新修改",
     "diffs.current-revision": "当前版本",
     "diffs.original-revision": "原始版本",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 后",
     "timeago_earlier": "%1 前"
 }

public/language/zh-TW/flags.json

@@ -32,6 +32,7 @@
 	"view-profile": "查看個人資料",
 	"start-new-chat": "開始新聊天對話",
 	"go-to-target": "查看舉報目標",
+	"assign-to-me": "Assign To Me",
 	"delete-post": "刪除貼文",
 	"purge-post": "清除貼文",
 	"restore-post": "恢復貼文",

public/language/zh-TW/topic.json

@@ -138,6 +138,9 @@
     "diffs.no-revisions-description": "該貼文已重新修改",
     "diffs.current-revision": "當前版本",
     "diffs.original-revision": "原始版本",
+    "diffs.restore": "Restore this revision",
+    "diffs.restore-description": "A new revision will be appended to this post's edit history.",
+    "diffs.post-restored": "Post successfully restored to earlier revision",
     "timeago_later": "%1 後",
     "timeago_earlier": "%1 前"
 }

public/openapi/read.yaml

@@ -4751,6 +4751,7 @@ paths:
                       title:
                         type: string
                   - $ref: components/schemas/Pagination.yaml#/Pagination
+                  - $ref: components/schemas/Breadcrumbs.yaml#/Breadcrumbs
                   - $ref: components/schemas/CommonProps.yaml#/CommonProps
   "/api/flags/{flagId}":
     get:
@@ -4963,6 +4964,7 @@ paths:
                         additionalProperties:
                           description: "A list of global and admin privileges, and whether the calling user has (or has inherited) them"
                           type: boolean
+                  - $ref: components/schemas/Breadcrumbs.yaml#/Breadcrumbs
                   - $ref: components/schemas/CommonProps.yaml#/CommonProps
   /api/post-queue:
     get:
@@ -5114,6 +5116,7 @@ paths:
                                       type: string
                             - $ref: components/schemas/CategoryObject.yaml#/CategoryObject
                   - $ref: components/schemas/Pagination.yaml#/Pagination
+                  - $ref: components/schemas/Breadcrumbs.yaml#/Breadcrumbs
                   - $ref: components/schemas/CommonProps.yaml#/CommonProps
   /api/ip-blacklist:
     get:

public/src/admin/manage/privileges.js

@@ -11,7 +11,7 @@ define('admin/manage/privileges', [
 	var cid;
 
 	Privileges.init = function () {
-		cid = ajaxify.data.cid || 'admin';
+		cid = isNaN(parseInt(ajaxify.data.cid, 10)) ? 'admin' : ajaxify.data.cid;
 
 		categorySelector.init($('[component="category-selector"]'), function (category) {
 			cid = parseInt(category.cid, 10);

public/src/app.js

@@ -445,7 +445,7 @@ app.cacheBuster = null;
 	app.toggleNavbar = function (state) {
 		var navbarEl = $('.navbar');
 		if (navbarEl) {
-			navbarEl.toggleClass('hidden', !state);
+			navbarEl[state ? 'show' : 'hide']();
 		}
 	};
 

public/src/client/flags/detail.js

@@ -13,6 +13,10 @@ define('forum/flags/detail', ['forum/flags/list', 'components', 'translator', 'b
 			var uid = $(this).parents('[data-uid]').attr('data-uid');
 
 			switch (action) {
+				case 'assign':
+					$('#assignee').val(app.user.uid);
+					// falls through
+
 				case 'update':
 					socket.emit('flags.update', {
 						flagId: ajaxify.data.flagId,

public/src/client/topic/diffs.js

@@ -16,10 +16,11 @@ define('forum/topic/diffs', ['forum/topic/images', 'benchpress', 'translator'],
 			}
 
 			Benchpress.parse('partials/modals/post_history', {
-				diffs: data.timestamps.map(function (timestamp) {
+				diffs: data.revisions.map(function (revision) {
-					timestamp = parseInt(timestamp, 10);
+					var timestamp = parseInt(revision.timestamp, 10);
 
 					return {
+						username: revision.username,
 						timestamp: timestamp,
 						pretty: new Date(timestamp).toLocaleString(config.userLang.replace('_', '-'), localeStringOpts),
 					};
@@ -44,7 +45,7 @@ define('forum/topic/diffs', ['forum/topic/images', 'benchpress', 'translator'],
 
 					selectEl.on('change', function () {
 						Diffs.load(pid, this.value, postContainer);
-						revertEl.prop('disabled', data.timestamps.indexOf(this.value) === -1);
+						revertEl.prop('disabled', data.timestamps.indexOf(this.value) === 0);
 					});
 
 					revertEl.on('click', function () {

src/controllers/globalmods.js

@@ -4,6 +4,7 @@ const user = require('../user');
 const meta = require('../meta');
 const analytics = require('../analytics');
 const usersController = require('./admin/users');
+const helpers = require('./helpers');
 
 const globalModsController = module.exports;
 
@@ -21,6 +22,7 @@ globalModsController.ipBlacklist = async function (req, res, next) {
 		title: '[[pages:ip-blacklist]]',
 		rules: rules,
 		analytics: analyticsData,
+		breadcrumbs: helpers.buildBreadcrumbs([{ text: '[[pages:ip-blacklist]]' }]),
 	});
 };