Merge branch 'dev' into '419-push-notifications'

# Conflicts:
#   src/assets/translations/en.json

src/assets/config.json

@@ -9,6 +9,7 @@
     "productLink": "letsconvene.im",
     "defaultServer": "https://neo.keanu.im",
     "identityServer_unset": "",
+    "registrationToken_unset": "",
     "rtl": false,
     "accentColor_unset": "",
     "logo_unset": "",

src/assets/css/chat.scss

@@ -101,22 +101,17 @@ body {
   }
 
   .notification-alert {
-    display: inline-block;
-    background-color: $alert-bg-color;
-    width: 8px;
-    height: 8px;
-    border-radius: 4px;
-    margin-bottom: 2px;
-    position: relative;
-    overflow: visible;
+    .icon-circle {
+      color: $alert-bg-color;
+    }
     &.popup-open::after {
-      top: 20px;
+      top: 35px;
       color: #246bfd;
     }
     .missed-items-popup {
       position: absolute;
       bottom: -17px;
-      left: -20px;
+      left: -175px;
       transform: translateY(100%);
       background: #246bfd;
       border-radius: 8px;
@@ -125,8 +120,10 @@ body {
       padding: 22px 18px 23px 18px;
       z-index: 300;
       user-select: none;
+      width: 300px;
+      justify-content: space-between;
       .text {
-        white-space: nowrap;
+        white-space: break-spaces;
         font-family: "Inter", sans-serif;
         font-style: normal;
         font-weight: 500;
@@ -161,7 +158,12 @@ body {
       backdrop-filter: blur(2px);
       -webkit-backdrop-filter: blur(2px);
     }
-}
+  }
+
+  @media #{map-get($display-breakpoints, 'sm-and-down')} {
+    position: fixed;
+    z-index: 10;
+  }
 }
 
 .chat-root {
@@ -791,6 +793,7 @@ body {
 
 .room-name-inline {
   text-align: start;
+  min-width: 75px;
 }
 
 .room-name.no-upper {
@@ -1286,7 +1289,7 @@ body {
   .option-warning {
     background: linear-gradient(0deg, #FFF3F3, #FFF3F3), #FFFBED;
     border-radius: 8px;
-    padding: 18px;   
+    padding: 18px;
     font-family: 'Inter', sans-serif;
     font-style: normal;
     font-weight: 400;
@@ -1294,7 +1297,7 @@ body {
     line-height: 17px;
     .v-icon {
       margin-right: 16px;
-    }   
+    }
   }
 }
 
@@ -1433,6 +1436,14 @@ body {
       width: 32px !important;
       height: 32px !important;
       margin-left: -8px !important;
+      position: relative;
+      overflow: visible;
+    }
+    .reaction-emoji {
+      position: absolute;
+      top: -6px;
+      right: -6px;
+      font-size: 17px;
     }
     .list-enter-active,
     .list-leave-active {
@@ -1452,6 +1463,9 @@ body {
     justify-content: flex-end;
     width: 100%;
   }
+  .clap-button {
+    font-size: 24px;
+  }
   .mic-button {
     align-self: flex-end;
   }

src/assets/translations/en.json

@@ -11,7 +11,13 @@
     "show_less": "Show less",
     "show_more": "Show more",
     "add_reaction": "Add reaction",
-    "click_to_remove": "Click to remove"
+    "click_to_remove": "Click to remove",
+    "time": {
+      "recently": "just now",
+      "minutes": "1 minute ago | {n} minutes ago",
+      "hours": "1 hour ago | {n} hours ago",
+      "days": "1 day ago | {n} days ago"
+    }
   },
   "menu": {
     "start_private_chat": "Private chat with this user",
@@ -90,7 +96,11 @@
     "incoming_message_deleted_text": "This message was deleted.",
     "not_allowed_to_send": "Only admins and moderators are allowed to send to the room",
     "reaction_count_more": "{reactionCount} more",
-    "seen_by": "Seen by no members | Seen by 1 member | Seen by {count} members"
+    "seen_by": "Seen by no members | Seen by 1 member | Seen by {count} members",
+    "file": "File",
+    "files": "Files",
+    "images": "Images",
+    "send_attachements_dialog_title": "Do you want to send following attachments ?"
   },
   "room": {
     "invitations": "You have no invitations | You have 1 invitation | You have {count} invitations",
@@ -164,7 +174,10 @@
     "send_verification": "Send verification email",
     "sent_verification": "An email has been sent to {email}. Please use your regular email client to verify the address.",
     "resend_verification": "Resend verification email",
-    "email_not_valid": "Email address not valid"
+    "email_not_valid": "Email address not valid",
+    "registration_token": "Please enter registration token",
+    "send_token": "Send token",
+    "token_not_valid": "Invalid token"
   },
   "profile": {
     "title": "My Profile",
@@ -206,7 +219,8 @@
     "status_logging_in": "Logging in...",
     "status_joining": "Joining room...",
     "join_failed": "Failed to join room.",
-    "choose_name": "Choose a name to use"
+    "choose_name": "Choose a name to use",
+    "you_have_been_banned": "You have been banned from this room."
   },
   "invite": {
     "title": "Add Friends",
@@ -332,5 +346,19 @@
   },
   "notification": {
     "title": "New message received"
+  },
+  "emoji": {
+    "search": "Search...",
+    "categories": {
+      "activity": "Activity",
+      "flags": "Flags",
+      "foods": "Foods",
+      "frequently": "Frequently used",
+      "objects": "Objects",
+      "nature": "Nature",
+      "peoples": "Peoples",
+      "symbols": "Symbols",
+      "places": "Places"
+    }
   }
 }

src/assets/translations/ug.json

@@ -30,36 +30,20 @@
         "edited": "تەھرىرلەندى",
         "file_prefix": "ھۆججەت ",
         "user_said": "{user} سۆزلىدى:",
-        "user_left": "قوللانغۇچى مۇنازىرىدىن چېكىندى",
-        "user_joined": "قوللانغۇچى مۇنازىرىغا قاتناشتى",
-        "user_was_invited": "قوللانغۇچى مۇنازىرە ئۆيىگە تەكلىپ قىلىندى...",
-        "user_encrypted_room": "قوللانغۇچى مۇنازىرە-خانىنى سىفىرلاشتۇردى",
-        "user_changed_room_avatar": "قوللانغۇچى مۇنازىرە-خانىدىكى كۆرىنىشىنى ئۆزگەرتتى",
-        "user_changed_avatar": "قوللانغۇچى كۆرىنىشىنى ئۆزگەرتتى",
-        "user_changed_display_name": "قوللانغۇچىنىڭ ئىسمى«يېڭى ئىسىمغا» ئۆزگەرتىلدى",
-        "user_aliased_room": "مۇنازىرە ئۆيىنىڭ ئىسمى ئۆزگەرتىلدى",
-        "user_created_room": "يېڭى مۇنازىرە ئۆيى قۇرۇلدى",
         "you": "سىز",
         "room_powerlevel_change": "{user} دەرىجىسىنى ئۆزگەرتىش {changes}",
-        "user_changed_guest_access_open": "قوللانغۇچى ئەزالارنىڭ مۇنازىرەخانىغا قوشۇلىشىغا رۇخسەت قىلدى",
-        "user_changed_guest_access_closed": "قوللانغۇچى ئەزالارنىڭ مۇنازىرەخانىغا قوشۇلۇشتىن رەت قىلىندى",
-        "user_powerlevel_change_from_to": "قوللانغۇچى بۇرۇنقى دەرىجىسىدىن يېڭى دەرىجىسىگە كۆتۈرىلدى",
         "scale_image": "كىچىكلەنمە رەسىم",
         "users_are_typing": "ئەزالىرى يېزىۋاتىدۇ {count}",
         "user_is_typing": "قوللانغۇچى يېزىۋاتىدۇ",
         "your_message": "ئۇچۇرىڭىز ...",
         "replying_to": "{user}",
         "unread_messages": "ئوقۇلمىغان ئۇچۇرلار",
-        "user_changed_room_topic": "قوللانغۇچى مۇنازىرەخانىنىڭ تېمىسىنى ئۆزگەرتتى",
-        "user_changed_room_name": "قوللانغۇچى مۇنازىرەخانىنىڭ ئىسمىنى ئۆزگەرتتى",
         "room_joinrule_public": "كۆپچىلىك",
         "room_joinrule_invite": "تەكلىپ قىلىڭ",
-        "user_changed_join_rules": "قوللانغۇچى مۇنازىرەخانىنى مەلۇم تىپقا ئۆزگەرتتى",
         "room_history_joined": "ئەزالار قاتناشقاندىن باشلاپ ئوقۇغىلى بولىدۇ",
         "room_history_invited": "ئەزالار تەكلىپ قىلىنغان ۋاقىتتىن باشلاپ ئوقۇغىلى بولىدۇ",
         "room_history_shared": "مۇنازىرەخانىدىكى ھەركىم ئوقۇيالايدۇ",
-        "room_history_world_readable": "ھەركىم ئوقۇيالايدۇ",
-        "user_changed_room_history": "قوللانغۇچى» مۇنازىرەخانىنىڭ تارىخىنى قۇردى»"
+        "room_history_world_readable": "ھەركىم ئوقۇيالايدۇ"
     },
     "language_display_name": "ئۇيغۇرچە",
     "new_room": {