From e59ea4bcbee1bbff1ff222197a88f63aeb119a94 Mon Sep 17 00:00:00 2001
From: Ali Hadi Mazeh <91922430+alihadimazeh@users.noreply.github.com>
Date: Mon, 17 Jun 2024 11:25:39 -0400
Subject: [PATCH 01/18] cancel button changed to reset (#5839)

---
 app/assets/locales/en.json                                    | 1 +
 app/javascript/components/users/user/forms/UpdateUserForm.jsx | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/locales/en.json b/app/assets/locales/en.json
index edd28bdebd..d8ad9461b3 100644
--- a/app/assets/locales/en.json
+++ b/app/assets/locales/en.json
@@ -14,6 +14,7 @@
   "report": "Report",
   "share": "Share",
   "cancel": "Cancel",
+  "reset":   "Reset",
   "close": "Close",
   "delete": "Delete",
   "copy": "Copy Join Link",
diff --git a/app/javascript/components/users/user/forms/UpdateUserForm.jsx b/app/javascript/components/users/user/forms/UpdateUserForm.jsx
index 7d524695b8..0bf18211d2 100644
--- a/app/javascript/components/users/user/forms/UpdateUserForm.jsx
+++ b/app/javascript/components/users/user/forms/UpdateUserForm.jsx
@@ -85,7 +85,7 @@ export default function UpdateUserForm({ user }) {
         </FormSelect>
       )}
       <Stack direction="horizontal" gap={2} className="float-end">
-        <Button variant="neutral" onClick={reset}> { t('cancel') } </Button>
+        <Button variant="neutral" onClick={reset}> { t('reset') } </Button>
         <Button variant="brand" type="submit" disabled={updateUserAPI.isLoading}>
           { t('update') }
           {updateUserAPI.isLoading && <Spinner className="me-2" />}

From 8aad7b2b58e4db59966ef4e2d9e554940780eb15 Mon Sep 17 00:00:00 2001
From: Ali Hadi Mazeh <91922430+alihadimazeh@users.noreply.github.com>
Date: Tue, 18 Jun 2024 09:40:24 -0400
Subject: [PATCH 02/18] External users can no longer change their names,
 similar to emails (#5840)

* External users can no longer change their names, similar to emails

* Rubocop fixes

* readOnly value is set to true or false depending on whether the current user is an external account or not

---------

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
---
 app/controllers/api/v1/users_controller.rb                  | 6 +++++-
 .../components/users/user/forms/UpdateUserForm.jsx          | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb
index e891d596c9..d28c0834a3 100644
--- a/app/controllers/api/v1/users_controller.rb
+++ b/app/controllers/api/v1/users_controller.rb
@@ -166,7 +166,11 @@ def create_user_params
       end
 
       def update_user_params
-        @update_user_params ||= params.require(:user).permit(:name, :password, :avatar, :language, :role_id, :invite_token)
+        @update_user_params ||= if external_auth?
+                                  params.require(:user).permit(:password, :avatar, :language, :role_id, :invite_token)
+                                else
+                                  params.require(:user).permit(:name, :password, :avatar, :language, :role_id, :invite_token)
+                                end
       end
 
       def change_password_params
diff --git a/app/javascript/components/users/user/forms/UpdateUserForm.jsx b/app/javascript/components/users/user/forms/UpdateUserForm.jsx
index 0bf18211d2..740f8d420f 100644
--- a/app/javascript/components/users/user/forms/UpdateUserForm.jsx
+++ b/app/javascript/components/users/user/forms/UpdateUserForm.jsx
@@ -70,7 +70,7 @@ export default function UpdateUserForm({ user }) {
 
   return (
     <Form methods={methods} onSubmit={updateUserAPI.mutate}>
-      <FormControl field={fields.name} type="text" />
+      <FormControl field={fields.name} type="text" readOnly={currentUser.external_account} />
       <FormControl field={fields.email} type="email" readOnly />
       <FormSelect field={fields.language} variant="dropdown">
         {

From ff77208b589ac46621824be5662ac5faff0fb7d7 Mon Sep 17 00:00:00 2001
From: Ali Hadi Mazeh <91922430+alihadimazeh@users.noreply.github.com>
Date: Wed, 19 Jun 2024 11:06:42 -0400
Subject: [PATCH 03/18] Admin can revoke user invites from Manage Users page
 (#5846)

* Admin can revoke user invites from Manage Users page

* Added tests for revoking user invites

* - checked for user count changing when testing for #destroy for invitations\n- fixed locale strings for revoking invites\n- other minor fixes

* Added license header for Changed Revoke Invite to Revoke with archive box x mark as icon
---
 app/assets/locales/en.json                    |  6 ++-
 .../api/v1/admin/invitations_controller.rb    |  9 +++++
 .../admin/manage_users/InvitedUsersTable.jsx  | 18 ++++++++-
 .../manage_users/useRevokeUserInvite.jsx      | 38 +++++++++++++++++++
 app/serializers/invitation_serializer.rb      |  2 +-
 config/routes.rb                              |  2 +-
 .../admin/invitations_controller_spec.rb      | 15 +++++++-
 7 files changed, 83 insertions(+), 7 deletions(-)
 create mode 100644 app/javascript/hooks/mutations/admin/manage_users/useRevokeUserInvite.jsx

diff --git a/app/assets/locales/en.json b/app/assets/locales/en.json
index d8ad9461b3..60a29c0d66 100644
--- a/app/assets/locales/en.json
+++ b/app/assets/locales/en.json
@@ -230,7 +230,8 @@
       "empty_invited_users_subtext": "When a user's status gets changed to invited, they will appear here.",
       "invited": {
         "time_sent": "Time Sent",
-        "valid": "Valid"
+        "valid": "Valid",
+        "revoke": "Revoke"
       }
     },
     "server_rooms": {
@@ -430,7 +431,8 @@
         "role_permission_updated": "The role permission has been updated."
       },
       "invitations": {
-        "invitation_sent": "An invitation has been sent."
+        "invitation_sent": "An invitation has been sent.",
+        "invitation_revoked": "An invitation has been revoked"
       }
     },
     "error": {
diff --git a/app/controllers/api/v1/admin/invitations_controller.rb b/app/controllers/api/v1/admin/invitations_controller.rb
index 6aab95298c..0ecaaf4ea6 100644
--- a/app/controllers/api/v1/admin/invitations_controller.rb
+++ b/app/controllers/api/v1/admin/invitations_controller.rb
@@ -60,6 +60,15 @@ def create
           logger.error "Failed to send invitations to #{params[:invitations][:emails]} - #{e}"
           render_error status: :bad_request
         end
+
+        def destroy
+          invitation = Invitation.find(params[:id])
+          if invitation.destroy
+            render_data status: :ok
+          else
+            render_error status: :not_found
+          end
+        end
       end
     end
   end
diff --git a/app/javascript/components/admin/manage_users/InvitedUsersTable.jsx b/app/javascript/components/admin/manage_users/InvitedUsersTable.jsx
index 35a3091191..2cfc2d70e0 100644
--- a/app/javascript/components/admin/manage_users/InvitedUsersTable.jsx
+++ b/app/javascript/components/admin/manage_users/InvitedUsersTable.jsx
@@ -16,9 +16,10 @@
 
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import { Table } from 'react-bootstrap';
+import { Table, Dropdown } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
-import { CheckIcon, XMarkIcon } from '@heroicons/react/24/solid';
+import { CheckIcon, XMarkIcon, ArchiveBoxXMarkIcon } from '@heroicons/react/24/solid';
+import { EllipsisVerticalIcon } from '@heroicons/react/24/outline';
 import SortBy from '../../shared_components/search/SortBy';
 import useInvitations from '../../../hooks/queries/admin/manage_users/useInvitations';
 import Pagination from '../../shared_components/Pagination';
@@ -27,12 +28,14 @@ import EmptyUsersList from './EmptyUsersList';
 import { localizeDateTimeString } from '../../../helpers/DateTimeHelper';
 import { useAuth } from '../../../contexts/auth/AuthProvider';
 import ManageUsersInvitedRowPlaceHolder from './ManageUsersInvitedRowPlaceHolder';
+import useRevokeUserInvite from '../../../hooks/mutations/admin/manage_users/useRevokeUserInvite';
 
 export default function InvitedUsersTable({ searchInput }) {
   const { t } = useTranslation();
   const [page, setPage] = useState();
   const { isLoading, data: invitations } = useInvitations(searchInput, page);
   const currentUser = useAuth();
+  const revokeUserInvite = useRevokeUserInvite();
 
   if (!searchInput && invitations?.data?.length === 0) {
     return <EmptyUsersList text={t('admin.manage_users.empty_invited_users')} subtext={t('admin.manage_users.empty_invited_users_subtext')} />;
@@ -73,6 +76,17 @@ export default function InvitedUsersTable({ searchInput }) {
                           <td className="text-dark border-0">
                             { invitation.valid ? <CheckIcon className="text-success hi-s" /> : <XMarkIcon className="text-danger hi-s" />}
                           </td>
+                          <td className="text-dark border-0">
+                            <Dropdown className="float-end cursor-pointer">
+                              <Dropdown.Toggle className="hi-s" as={EllipsisVerticalIcon} />
+                              <Dropdown.Menu>
+                                <Dropdown.Item onClick={() => revokeUserInvite.mutate(invitation.id)}>
+                                  <ArchiveBoxXMarkIcon className="hi-s me-2" />
+                                  {t('admin.manage_users.invited.revoke')}
+                                </Dropdown.Item>
+                              </Dropdown.Menu>
+                            </Dropdown>
+                          </td>
                         </tr>
                       ))
                     )
diff --git a/app/javascript/hooks/mutations/admin/manage_users/useRevokeUserInvite.jsx b/app/javascript/hooks/mutations/admin/manage_users/useRevokeUserInvite.jsx
new file mode 100644
index 0000000000..13eaab03d3
--- /dev/null
+++ b/app/javascript/hooks/mutations/admin/manage_users/useRevokeUserInvite.jsx
@@ -0,0 +1,38 @@
+// BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
+//
+// Copyright (c) 2022 BigBlueButton Inc. and by respective authors (see below).
+//
+// This program is free software; you can redistribute it and/or modify it under the
+// terms of the GNU Lesser General Public License as published by the Free Software
+// Foundation; either version 3.0 of the License, or (at your option) any later
+// version.
+//
+// Greenlight is distributed in the hope that it will be useful, but WITHOUT ANY
+// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+// PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License along
+// with Greenlight; if not, see <http://www.gnu.org/licenses/>.
+
+import { useMutation, useQueryClient } from 'react-query';
+import { toast } from 'react-toastify';
+import { useTranslation } from 'react-i18next';
+import axios from '../../../../helpers/Axios';
+
+export default function useRevokeUserInvite() {
+  const { t } = useTranslation();
+  const queryClient = useQueryClient();
+
+  return useMutation(
+    (id) => axios.delete(`/admin/invitations/${id}.json`),
+    {
+      onSuccess: () => {
+        queryClient.invalidateQueries(['getInvitations']);
+        toast.success(t('toast.success.invitations.invitation_revoked'));
+      },
+      onError: () => {
+        toast.error(t('toast.error.problem_completing_action'));
+      },
+    },
+  );
+}
diff --git a/app/serializers/invitation_serializer.rb b/app/serializers/invitation_serializer.rb
index 73767299fb..9d297dfa72 100644
--- a/app/serializers/invitation_serializer.rb
+++ b/app/serializers/invitation_serializer.rb
@@ -17,7 +17,7 @@
 # frozen_string_literal: true
 
 class InvitationSerializer < ApplicationSerializer
-  attributes :email, :updated_at, :valid
+  attributes :id, :email, :updated_at, :valid
 
   def valid
     object.updated_at.in(Invitation::INVITATION_VALIDITY_PERIOD)
diff --git a/config/routes.rb b/config/routes.rb
index 6851e54b9c..6954ac32f7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -106,7 +106,7 @@
         end
         resources :rooms_configurations, only: :update, param: :name
         resources :roles
-        resources :invitations, only: %i[index create]
+        resources :invitations, only: %i[index create destroy]
         resources :role_permissions, only: [:index] do
           collection do
             post '/', to: 'role_permissions#update'
diff --git a/spec/controllers/admin/invitations_controller_spec.rb b/spec/controllers/admin/invitations_controller_spec.rb
index 5ad306a93c..d41ba975e5 100644
--- a/spec/controllers/admin/invitations_controller_spec.rb
+++ b/spec/controllers/admin/invitations_controller_spec.rb
@@ -18,7 +18,7 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::Admin::InvitationsController, type: :controller do
+RSpec.describe Api::V1::Admin::InvitationsController do
   let(:user) { create(:user) }
   let(:user_with_manage_users_permission) { create(:user, :with_manage_users_permission) }
 
@@ -105,4 +105,17 @@
       end
     end
   end
+
+  describe 'invitation#destroy' do
+    it 'deletes the invitation' do
+      invitation = create(:invitation)
+      expect { delete :destroy, params: { id: invitation.id } }.to change(Invitation, :count).by(-1)
+      expect(response).to have_http_status(:ok)
+    end
+
+    it 'fails to delete the invitation if the id does not exist' do
+      expect { delete :destroy, params: { id: 'invalid-id' } }.not_to change(Invitation, :count)
+      expect(response).to have_http_status(:not_found)
+    end
+  end
 end

From fd232aa07018172f7df06865f21bf99a04e87447 Mon Sep 17 00:00:00 2001
From: Ahmad Farhat <ahmad.af.farhat@gmail.com>
Date: Mon, 24 Jun 2024 14:19:15 -0400
Subject: [PATCH 04/18] Fixed small issue with tenant setup (#5855)

---
 app/services/tenant_setup.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/services/tenant_setup.rb b/app/services/tenant_setup.rb
index 12ff066578..47a8b8651f 100644
--- a/app/services/tenant_setup.rb
+++ b/app/services/tenant_setup.rb
@@ -55,7 +55,6 @@ def create_site_settings
       { setting: Setting.find_by(name: 'RoleMapping'), value: '', provider: @provider },
       { setting: Setting.find_by(name: 'DefaultRole'), provider: @provider, value: 'User' },
       { setting: Setting.find_by(name: 'DefaultRecordingVisibility'), provider: @provider, value: 'Published' },
-      { setting: Setting.find_by(name: 'HelpCenter'), provider: @provider, value: '' },
       { setting: Setting.find_by(name: 'Maintenance'), provider: @provider, value: '' },
       { setting: Setting.find_by(name: 'SessionTimeout'), provider: @provider, value: '1' }
     ]

From 7df45bdcdfefb6e1fa4923116010503bb2f5034b Mon Sep 17 00:00:00 2001
From: Ali Hadi Mazeh <91922430+alihadimazeh@users.noreply.github.com>
Date: Mon, 24 Jun 2024 14:19:51 -0400
Subject: [PATCH 05/18] Invitation expiration date changed to 7 days (#5851)

* Invitation expiration date changed to 7 days. Serializer updated to check for validity of invite.

* Minor tweak to valid method in the invitation serializer
---
 app/models/invitation.rb                 | 2 +-
 app/serializers/invitation_serializer.rb | 2 +-
 config/locales/en.yml                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/invitation.rb b/app/models/invitation.rb
index e9e08f8855..0601b79ec8 100644
--- a/app/models/invitation.rb
+++ b/app/models/invitation.rb
@@ -17,7 +17,7 @@
 # frozen_string_literal: true
 
 class Invitation < ApplicationRecord
-  INVITATION_VALIDITY_PERIOD = 48.hours
+  INVITATION_VALIDITY_PERIOD = 7.days
 
   has_secure_token :token
 
diff --git a/app/serializers/invitation_serializer.rb b/app/serializers/invitation_serializer.rb
index 9d297dfa72..00b94a4c10 100644
--- a/app/serializers/invitation_serializer.rb
+++ b/app/serializers/invitation_serializer.rb
@@ -20,6 +20,6 @@ class InvitationSerializer < ApplicationSerializer
   attributes :id, :email, :updated_at, :valid
 
   def valid
-    object.updated_at.in(Invitation::INVITATION_VALIDITY_PERIOD)
+    object.updated_at < Invitation::INVITATION_VALIDITY_PERIOD.ago
   end
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a5437ca7f3..82517b95d2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -63,7 +63,7 @@ en:
       invitation_to_join: BigBlueButton Invitation
       you_have_been_invited: You have been invited to create a BigBlueButton account by %{name}.
       get_started: To sign up, please click the button below and follow the steps.
-      valid_invitation: The invitation is valid for 24 hours.
+      valid_invitation: The invitation is valid for 7 days.
       sign_up: Sign Up
     new_user_signup:
       new_user: New BigBlueButton User Signup

From 708e4b336c2cb66d0e0eafd748c1a3a763381af5 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 14:20:06 -0400
Subject: [PATCH 06/18] Translate app/assets/locales/en.json in ja (#5854)

100% translated source file: 'app/assets/locales/en.json'
on 'ja'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
---
 app/assets/locales/ja.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/assets/locales/ja.json b/app/assets/locales/ja.json
index 181926bb0d..62d3c7dbed 100644
--- a/app/assets/locales/ja.json
+++ b/app/assets/locales/ja.json
@@ -14,6 +14,7 @@
   "report": "報告",
   "share": "共有",
   "cancel": "キャンセル",
+  "reset":   "リセット",
   "close": "閉じる",
   "delete": "削除",
   "copy": "参加リンクをコピー",
@@ -229,7 +230,8 @@
       "empty_invited_users_subtext": "ユーザーの状態が招待中に変わると、こちらに表示されます。",
       "invited": {
         "time_sent": "送付日時",
-        "valid": "有効"
+        "valid": "有効",
+        "revoke": "取り消す"
       }
     },
     "server_rooms": {
@@ -429,7 +431,8 @@
         "role_permission_updated": "この役割の権限が更新されました。"
       },
       "invitations": {
-        "invitation_sent": "招待状が送付されました"
+        "invitation_sent": "招待状が送付されました",
+        "invitation_revoked": "招待状を取り消しました"
       }
     },
     "error": {

From 8690695f8daf5b7588173d6922e2c428a33f4296 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 14:20:18 -0400
Subject: [PATCH 07/18] Translate app/assets/locales/en.json in el (#5850)

100% translated source file: 'app/assets/locales/en.json'
on 'el'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
---
 app/assets/locales/el.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/assets/locales/el.json b/app/assets/locales/el.json
index 28d6b3c5a4..6ea43f0b92 100644
--- a/app/assets/locales/el.json
+++ b/app/assets/locales/el.json
@@ -14,6 +14,7 @@
   "report": "Αναφορά",
   "share": "Κοινή χρήση",
   "cancel": "Ακύρωση",
+  "reset":   "Επαναφορά",
   "close": "Κλείσιμο",
   "delete": "Διαγραφή",
   "copy": "Αντιγραφή συνδέσμου εγγραφής",
@@ -229,7 +230,8 @@
       "empty_invited_users_subtext": "Μόλις η κατάσταση του χρήστη αλλάξει σε προσκεκλημένος, θα εμφανιστεί εδώ.",
       "invited": {
         "time_sent": "Ώρα αποστολής",
-        "valid": "Έγκυρο"
+        "valid": "Έγκυρο",
+        "revoke": "Ανάκληση"
       }
     },
     "server_rooms": {
@@ -429,7 +431,8 @@
         "role_permission_updated": "Τα δικαιώματα του ρόλου ενημερώθηκαν."
       },
       "invitations": {
-        "invitation_sent": "Η πρόσκληση στάλθηκε"
+        "invitation_sent": "Η πρόσκληση στάλθηκε",
+        "invitation_revoked": "Έχει γίνει ανάκληση μιας πρόσκλησης"
       }
     },
     "error": {

From f2f922691f38b45b0854249e1e394b858bd5c0b5 Mon Sep 17 00:00:00 2001
From: Anton Georgiev <antobinary@users.noreply.github.com>
Date: Mon, 24 Jun 2024 14:21:00 -0400
Subject: [PATCH 08/18] [Snyk] Security upgrade rails from 7.1.3.1 to 7.1.3.3
 (#5842)

* fix: Gemfile & Gemfile.lock to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-RUBY-ACTIONTEXT-7247324

* Update Gemfile.lock

---------

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
---
 Gemfile      |   2 +-
 Gemfile.lock | 144 +++++++++++++++++++++++++--------------------------
 2 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2e3ec8ba07..315698c8b0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -30,7 +30,7 @@ gem 'omniauth-rails_csrf_protection', '~> 1.0.1'
 gem 'pagy', '~> 6.0', '>= 6.0.0'
 gem 'pg'
 gem 'puma', '~> 5.6'
-gem 'rails', '~> 7.1.3'
+gem 'rails', '~> 7.1.3', '>= 7.1.3.3'
 gem 'redis', '~> 4.0'
 gem 'sprockets-rails'
 gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
diff --git a/Gemfile.lock b/Gemfile.lock
index f5ea4a2a32..82fb53def0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,35 +1,35 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.3.1)
-      actionpack (= 7.1.3.1)
-      activesupport (= 7.1.3.1)
+    actioncable (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.3.1)
-      actionpack (= 7.1.3.1)
-      activejob (= 7.1.3.1)
-      activerecord (= 7.1.3.1)
-      activestorage (= 7.1.3.1)
-      activesupport (= 7.1.3.1)
+    actionmailbox (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.3.1)
-      actionpack (= 7.1.3.1)
-      actionview (= 7.1.3.1)
-      activejob (= 7.1.3.1)
-      activesupport (= 7.1.3.1)
+    actionmailer (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      actionview (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.3.1)
-      actionview (= 7.1.3.1)
-      activesupport (= 7.1.3.1)
+    actionpack (7.1.3.4)
+      actionview (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -37,15 +37,15 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.3.1)
-      actionpack (= 7.1.3.1)
-      activerecord (= 7.1.3.1)
-      activestorage (= 7.1.3.1)
-      activesupport (= 7.1.3.1)
+    actiontext (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.3.1)
-      activesupport (= 7.1.3.1)
+    actionview (7.1.3.4)
+      activesupport (= 7.1.3.4)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -60,22 +60,22 @@ GEM
       activemodel (>= 5.2.0)
       activestorage (>= 5.2.0)
       activesupport (>= 5.2.0)
-    activejob (7.1.3.1)
-      activesupport (= 7.1.3.1)
+    activejob (7.1.3.4)
+      activesupport (= 7.1.3.4)
       globalid (>= 0.3.6)
-    activemodel (7.1.3.1)
-      activesupport (= 7.1.3.1)
-    activerecord (7.1.3.1)
-      activemodel (= 7.1.3.1)
-      activesupport (= 7.1.3.1)
+    activemodel (7.1.3.4)
+      activesupport (= 7.1.3.4)
+    activerecord (7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       timeout (>= 0.4.0)
-    activestorage (7.1.3.1)
-      actionpack (= 7.1.3.1)
-      activejob (= 7.1.3.1)
-      activerecord (= 7.1.3.1)
-      activesupport (= 7.1.3.1)
+    activestorage (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       marcel (~> 1.0)
-    activesupport (7.1.3.1)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -116,12 +116,12 @@ GEM
       rack (>= 1.6.11)
       rubyzip (>= 1.3.0)
       xml-simple (~> 1.1)
-    bigdecimal (3.1.7)
+    bigdecimal (3.1.8)
     bindata (2.5.0)
     bindex (0.8.1)
     bootsnap (1.16.0)
       msgpack (~> 1.2)
-    builder (3.2.4)
+    builder (3.3.0)
     capybara (3.38.0)
       addressable
       matrix
@@ -135,7 +135,7 @@ GEM
       activesupport
     childprocess (4.1.0)
     clamby (1.6.10)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     crack (0.4.5)
       rexml
@@ -215,15 +215,15 @@ GEM
       json
     hiredis (0.6.3)
     httpclient (2.8.3)
-    i18n (1.14.4)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     i18n-language-mapping (0.1.3.1)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     io-console (0.7.2)
-    irb (1.12.0)
-      rdoc
+    irb (1.13.1)
+      rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
@@ -255,32 +255,32 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.2)
+    marcel (1.0.4)
     matrix (0.4.2)
     memoist (0.16.2)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.6)
-    minitest (5.22.3)
+    mini_portile2 (2.8.7)
+    minitest (5.23.1)
     msgpack (1.6.0)
     multi_json (1.15.0)
     mutex_m (0.2.0)
     net-http (0.4.1)
       uri
-    net-imap (0.4.10)
+    net-imap (0.4.12)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.0)
       net-protocol
-    nio4r (2.7.0)
-    nokogiri (1.16.4)
+    nio4r (2.7.3)
+    nokogiri (1.16.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.16.4-x86_64-linux)
+    nokogiri (1.16.5-x86_64-linux)
       racc (~> 1.4)
     omniauth (2.1.2)
       hashie (>= 3.4.6)
@@ -317,7 +317,7 @@ GEM
     public_suffix (5.0.3)
     puma (5.6.8)
       nio4r (~> 2.0)
-    racc (1.7.3)
+    racc (1.8.0)
     rack (2.2.9)
     rack-oauth2 (2.2.0)
       activesupport
@@ -336,20 +336,20 @@ GEM
     rackup (1.0.0)
       rack (< 3)
       webrick
-    rails (7.1.3.1)
-      actioncable (= 7.1.3.1)
-      actionmailbox (= 7.1.3.1)
-      actionmailer (= 7.1.3.1)
-      actionpack (= 7.1.3.1)
-      actiontext (= 7.1.3.1)
-      actionview (= 7.1.3.1)
-      activejob (= 7.1.3.1)
-      activemodel (= 7.1.3.1)
-      activerecord (= 7.1.3.1)
-      activestorage (= 7.1.3.1)
-      activesupport (= 7.1.3.1)
+    rails (7.1.3.4)
+      actioncable (= 7.1.3.4)
+      actionmailbox (= 7.1.3.4)
+      actionmailer (= 7.1.3.4)
+      actionpack (= 7.1.3.4)
+      actiontext (= 7.1.3.4)
+      actionview (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       bundler (>= 1.15.0)
-      railties (= 7.1.3.1)
+      railties (= 7.1.3.4)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -357,9 +357,9 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.3.1)
-      actionpack (= 7.1.3.1)
-      activesupport (= 7.1.3.1)
+    railties (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -367,11 +367,11 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.2.1)
-    rdoc (6.6.3.1)
+    rdoc (6.7.0)
       psych (>= 4.0.0)
     redis (4.8.0)
     regexp_parser (2.8.1)
-    reline (0.5.4)
+    reline (0.5.9)
       io-console (~> 0.5)
     remote_syslog_logger (1.0.4)
       syslog_protocol
@@ -496,7 +496,7 @@ GEM
       rexml
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.13)
+    zeitwerk (2.6.15)
 
 PLATFORMS
   ruby
@@ -534,7 +534,7 @@ DEPENDENCIES
   pagy (~> 6.0, >= 6.0.0)
   pg
   puma (~> 5.6)
-  rails (~> 7.1.3)
+  rails (~> 7.1.3, >= 7.1.3.3)
   redis (~> 4.0)
   remote_syslog_logger
   rspec-rails (>= 6.0.4)

From 60e79bdcfb687fb65fa9e0fce2ff2b45b9b53a1c Mon Sep 17 00:00:00 2001
From: Jesus Federico <jesus@123it.ca>
Date: Mon, 24 Jun 2024 14:21:51 -0400
Subject: [PATCH 09/18] fix: Gemfile & Gemfile.lock to reduce vulnerabilities
 (#5838)

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-RUBY-NOKOGIRI-7164639
- https://snyk.io/vuln/SNYK-RUBY-RACK-1061917
- https://snyk.io/vuln/SNYK-RUBY-ACTIONPACK-7210237

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
---
 Gemfile      |  2 +-
 Gemfile.lock | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 315698c8b0..42a1040c80 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,7 +32,7 @@ gem 'pg'
 gem 'puma', '~> 5.6'
 gem 'rails', '~> 7.1.3', '>= 7.1.3.3'
 gem 'redis', '~> 4.0'
-gem 'sprockets-rails'
+gem 'sprockets-rails', '>= 3.5.0'
 gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 82fb53def0..d90a57f88d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -442,12 +442,12 @@ GEM
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    sprockets (4.2.0)
+    sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
+    sprockets-rails (3.5.0)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
       sprockets (>= 3.0.0)
     stringio (3.1.0)
     swd (2.0.2)
@@ -546,7 +546,7 @@ DEPENDENCIES
   rubocop-rspec (~> 2.9.0)
   selenium-webdriver
   shoulda-matchers (~> 5.0)
-  sprockets-rails
+  sprockets-rails (>= 3.5.0)
   tzinfo-data
   web-console (>= 4.2.1)
   webdrivers

From 63b263f8df761a24a2afe4a4aaea5368020c78d0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 14:31:19 -0400
Subject: [PATCH 10/18] Bump braces from 3.0.2 to 3.0.3 (#5856)

Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 31 ++++++++++++++++++++-----------
 yarn.lock         | 16 ++++++++--------
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a93e865bd4..e956500984 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3549,12 +3549,11 @@
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "license": "MIT",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
@@ -4732,10 +4731,9 @@
       }
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "license": "MIT",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -4837,6 +4835,19 @@
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
       "license": "ISC"
     },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -5437,7 +5448,6 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
@@ -7243,7 +7253,6 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
diff --git a/yarn.lock b/yarn.lock
index 52cf063646..7c25c3bb52 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1728,11 +1728,11 @@ brace-expansion@^1.1.7:
     concat-map "0.0.1"
 
 braces@^3.0.2, braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 broadcast-channel@^3.4.1:
   version "3.7.0"
@@ -2410,10 +2410,10 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 

From 1137c06dc5ceb8a7a492fa6f73f6373331fc1582 Mon Sep 17 00:00:00 2001
From: Jesus Federico <jesus@123it.ca>
Date: Mon, 24 Jun 2024 14:45:45 -0400
Subject: [PATCH 11/18] [Snyk] Security upgrade omniauth-rails_csrf_protection
 from 1.0.1 to 1.0.2 (#5804)

* fix: Gemfile & Gemfile.lock to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-RUBY-RACK-1061917

* Update Gemfile.lock

---------

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 42a1040c80..9e19b81431 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,7 +26,7 @@ gem 'jwt'
 gem 'mini_magick', '>= 4.9.5'
 gem 'omniauth', '~> 2.1.2'
 gem 'omniauth_openid_connect', '>= 0.6.1'
-gem 'omniauth-rails_csrf_protection', '~> 1.0.1'
+gem 'omniauth-rails_csrf_protection', '~> 1.0.2'
 gem 'pagy', '~> 6.0', '>= 6.0.0'
 gem 'pg'
 gem 'puma', '~> 5.6'
diff --git a/Gemfile.lock b/Gemfile.lock
index d90a57f88d..86bfec749b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -286,7 +286,7 @@ GEM
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
-    omniauth-rails_csrf_protection (1.0.1)
+    omniauth-rails_csrf_protection (1.0.2)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
     omniauth_openid_connect (0.7.1)
@@ -529,7 +529,7 @@ DEPENDENCIES
   lograge (~> 0.14.0)
   mini_magick (>= 4.9.5)
   omniauth (~> 2.1.2)
-  omniauth-rails_csrf_protection (~> 1.0.1)
+  omniauth-rails_csrf_protection (~> 1.0.2)
   omniauth_openid_connect (>= 0.6.1)
   pagy (~> 6.0, >= 6.0.0)
   pg

From c3a598569fe24930f56fcf684fbe0ee80697fe81 Mon Sep 17 00:00:00 2001
From: Ali Hadi Mazeh <91922430+alihadimazeh@users.noreply.github.com>
Date: Tue, 25 Jun 2024 09:48:03 -0400
Subject: [PATCH 12/18] Valid invitation fix (#5858)

* Invitation expiration date changed to 7 days. Serializer updated to check for validity of invite.

* Minor tweak to valid method in the invitation serializer

* Fixed validity check for invitation

---------

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
---
 app/serializers/invitation_serializer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/serializers/invitation_serializer.rb b/app/serializers/invitation_serializer.rb
index 00b94a4c10..b25bf1ac1a 100644
--- a/app/serializers/invitation_serializer.rb
+++ b/app/serializers/invitation_serializer.rb
@@ -20,6 +20,6 @@ class InvitationSerializer < ApplicationSerializer
   attributes :id, :email, :updated_at, :valid
 
   def valid
-    object.updated_at < Invitation::INVITATION_VALIDITY_PERIOD.ago
+    object.updated_at > Invitation::INVITATION_VALIDITY_PERIOD.ago
   end
 end

From 67e2f5933155c95573eb3994507fd19568957cfc Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Tue, 25 Jun 2024 09:48:24 -0400
Subject: [PATCH 13/18] Translate app/assets/locales/en.json in fr (#5866)

100% translated source file: 'app/assets/locales/en.json'
on 'fr'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
---
 app/assets/locales/fr.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/assets/locales/fr.json b/app/assets/locales/fr.json
index 0ee437ee7b..ae585974d1 100644
--- a/app/assets/locales/fr.json
+++ b/app/assets/locales/fr.json
@@ -14,6 +14,7 @@
   "report": "Signaler",
   "share": "Partager",
   "cancel": "Annuler",
+  "reset":   "Réinitialiser",
   "close": "Fermer",
   "delete": "Supprimer",
   "copy": "Copier",
@@ -229,7 +230,8 @@
       "empty_invited_users_subtext": "Lorsque le statut d'un utilisateur passe à invité, il apparaîtra ici.",
       "invited": {
         "time_sent": "Heure d'envoi",
-        "valid": "Valide"
+        "valid": "Valide",
+        "revoke": "Révoquer"
       }
     },
     "server_rooms": {
@@ -429,7 +431,8 @@
         "role_permission_updated": "L'autorisation pour ce rôle a été modifiée"
       },
       "invitations": {
-        "invitation_sent": "L'invitation a été envoyée"
+        "invitation_sent": "L'invitation a été envoyée",
+        "invitation_revoked": "Une invitation a été révoquée."
       }
     },
     "error": {

From e3a577b69592ef3747dba4bcb1114487124a3219 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Tue, 25 Jun 2024 09:48:45 -0400
Subject: [PATCH 14/18] Translate config/locales/en.yml in fr (#5865)

100% translated source file: 'config/locales/en.yml'
on 'fr'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
---
 config/locales/fr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index d5354e0717..4226cfc3be 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -63,7 +63,7 @@ fr:
       invitation_to_join: Invitation à rejoindre BigBlueButton
       you_have_been_invited: "Vous avez été invité à créer un compte dans BigBlueButton par %{name}."
       get_started: "Pour vous inscrire, veuillez cliquer sur le bouton ci-dessous et suivre les étapes proposées"
-      valid_invitation: L'invitation est valable pendant 24 heures.
+      valid_invitation: Cette invitation a une validité de 7 jours.
       sign_up: Inscription
     new_user_signup:
       new_user: Nouvelle inscription d'un utilisateur dans BigBlueButton

From ba8b41f3e9394aade751ec7808bf99381f4deb5b Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Tue, 25 Jun 2024 09:49:47 -0400
Subject: [PATCH 15/18] Translate config/locales/en.yml in el (#5863)

100% translated source file: 'config/locales/en.yml'
on 'el'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
---
 config/locales/el.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/el.yml b/config/locales/el.yml
index 0b8b9de257..9b3e0f3774 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -63,7 +63,7 @@ el:
       invitation_to_join: Πρόσκληση στο BigBlueButton
       you_have_been_invited: "Έχετε προσκληθεί να δημιουργήσετε λογαριασμό στο BigBlueButton από τον/την %{name}."
       get_started: "Για εγγραφή, παρακαλούμε κάντε κλικ στο παρακάτω κουμπί και ακολουθήστε τα βήματα."
-      valid_invitation: Η πρόσκληση ισχύει για 24 ώρες.
+      valid_invitation: "Η πρόσκληση ισχύει για 7 ημέρες. "
       sign_up: Εγγραφή
     new_user_signup:
       new_user: Εγγραφή νέου χρήστη BigBlueButton

From 2828581afff8c69921b74ec39480cd9b2e4ba72a Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Tue, 25 Jun 2024 09:50:01 -0400
Subject: [PATCH 16/18] Translate config/locales/en.yml in ar (#5862)

100% translated source file: 'config/locales/en.yml'
on 'ar'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
---
 config/locales/ar.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 4949ba0553..6a4a64effc 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -63,7 +63,7 @@ ar:
       invitation_to_join: دعوة  بك_بلو_بتن
       you_have_been_invited: "لقد تمت دعوتك لإنشاء حساب  بك_بلو_بتن بواسطة %{name}."
       get_started: للتسجيل ، يرجى النقر فوق الزر أدناه واتباع الخطوات.
-      valid_invitation: الدعوة صالحة لمدة 24 ساعة.
+      valid_invitation: الدعوة صالحة لمدة 7 أيام.
       sign_up: التسجيل
     new_user_signup:
       new_user: تسجيل مستخدم جديد في بك_بلو_بتن

From b48a83cf4501019acb56eeefc0a982141aacb501 Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Tue, 25 Jun 2024 09:50:12 -0400
Subject: [PATCH 17/18] Translate app/assets/locales/en.json in fa_IR (#5861)

100% translated source file: 'app/assets/locales/en.json'
on 'fa_IR'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
---
 app/assets/locales/fa_IR.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/assets/locales/fa_IR.json b/app/assets/locales/fa_IR.json
index c2ebc6cf7b..1a1097fa7b 100644
--- a/app/assets/locales/fa_IR.json
+++ b/app/assets/locales/fa_IR.json
@@ -14,6 +14,7 @@
   "report": "گزارش",
   "share": "هم‌رسانی",
   "cancel": "انصراف",
+  "reset":   "بازنشانی",
   "close": "بستن",
   "delete": "حذف",
   "copy": "رونوشت پیوند عضویت",
@@ -229,7 +230,8 @@
       "empty_invited_users_subtext": "هنگامی که وضعیت یک کاربر به دعوت‌شده تغییر می‌کند، در اینجا نمایان می‌شوند.",
       "invited": {
         "time_sent": "زمان ارسال‌شده",
-        "valid": "معتبر"
+        "valid": "معتبر",
+        "revoke": "ابطال"
       }
     },
     "server_rooms": {
@@ -429,7 +431,8 @@
         "role_permission_updated": "دسترسی نقش به‌روز شده‌است."
       },
       "invitations": {
-        "invitation_sent": "دعوت‌نامه ارسال شده‌است."
+        "invitation_sent": "دعوت‌نامه ارسال شده‌است.",
+        "invitation_revoked": "یک دعوت‌نامه ابطال شده است"
       }
     },
     "error": {

From 6b1f93d8ca2e536702e0c6638627b31345d3665e Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Tue, 25 Jun 2024 09:50:30 -0400
Subject: [PATCH 18/18] Translate config/locales/en.yml in fa_IR (#5860)

100% translated source file: 'config/locales/en.yml'
on 'fa_IR'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
---
 config/locales/fa_IR.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/config/locales/fa_IR.yml b/config/locales/fa_IR.yml
index d8586cadfd..e9fac9f610 100644
--- a/config/locales/fa_IR.yml
+++ b/config/locales/fa_IR.yml
@@ -47,37 +47,37 @@
 
 fa_IR:
   opengraph:
-    description: یادگیری با استفاده از BigBlueButton، راه‌حل متن‌باز کنفرانس وب قابل اعتماد است که همکاری مجازی یکپارچه و تجربیات یادگیری آنلاین را امکان پذیر می‌کند.
+    description: با استفاده از BigBlueButton بیاموزید؛ راه‌حل متن‌باز و قابل اعتماد کنفرانس تحت وب که همکاری مجازی یکپارچه و تجربیات یادگیری آنلاین را امکان‌پذیر می‌کند.
   meeting:
-    moderator_message: "برای دعوت از افراد دیگر به این جلسه، این پیوند را برای آنها ارسال کنید:"
+    moderator_message: "برای دعوت از افراد دیگر به این جلسه، این پیوند را برای آن‌ها ارسال کنید:"
     access_code: "کد دسترسی: %{code}"
   email:
     activation:
       account_activation: فعال‌سازی حساب کاربری
       welcome_to_bbb: به BigBlueButton خوش آمدید.
-      get_started: برای شروع، لطفا با کلیک بر روی دکمه زیر حساب کاربری خود را فعال کنید.
-      activate_account: فعال کردن حساب کاربری
+      get_started: برای شروع، لطفا با کلیک بر روی دکمهٔ زیر حساب کاربری خود را فعال کنید.
+      activate_account: فعال‌کردن حساب کاربری
       link_expires: این پیوند ۲۴ ساعت دیگر منقضی خواهد شد.
-      if_link_expires: در صورت منقضی شدن پیوند، لطفا در سیستم وارد شوید و درخواست فعال سازی ایمیل، جدید کنید.
+      if_link_expires: در صورت منقضی‌شدن پیوند، لطفا وارد شوید و درخواست یک رایانامهٔ فعال‌سازی جدید کنید.
     invitation:
-      invitation_to_join: دعوت به پیوستن به BigBlueButton
+      invitation_to_join: دعوت‌نامهٔ BigBlueButton
       you_have_been_invited: "شما توسط %{name} برای ایجاد حساب کاربری در BigBlueButton دعوت شده‌اید."
-      get_started: برای ثبت نام لطفا روی دکمه زیر کلیک کنید و مراحل را دنبال کنید.
-      valid_invitation: The invitation is valid for 24 hours.
-      sign_up: ثبت نام
+      get_started: برای ثبت‌نام، لطفا روی دکمهٔ زیر کلیک کنید و گام‌ها را دنبال کنید.
+      valid_invitation: دعوت‌نامه فقط ۷ روز اعتبار دارد.
+      sign_up: ثبت‌نام
     new_user_signup:
       new_user: ثبت نام کاربر جدید BigBlueButton
       new_user_description: یک کاربر جدید برای استفاده از BigBlueButton ثبت نام کرده است.
       name: "نام: %{name}"
       email: "ایمیل: %{email}"
-      admin_panel: "پنل مدیریت"
-      take_action: "برای مشاهده کاربر جدید یا انجام اقدامات لازم، به پنل مدیریت مراجعه کنید"
+      admin_panel: "پنل مدیر کل"
+      take_action: "برای مشاهده کاربر جدید یا انجام اقدامات لازم، به پنل مدیر مراجعه کنید"
     reset:
-      password_reset: بازنشانی رمز عبور
-      password_reset_requested: "بازنشانی رمز عبور برای %{email} درخواست شده است."
-      password_reset_confirmation: برای بازنشانی رمز عبور، لطفا روی دکمه زیر کلیک کنید.
-      reset_password: بازنشانی رمز عبور
+      password_reset: بازنشانی گذرواژه
+      password_reset_requested: "بازنشانی گذرواژه برای %{email} درخواست شده‌است."
+      password_reset_confirmation: برای بازنشانی گذرواژه، لطفا روی دکمهٔ زیر کلیک کنید.
+      reset_password: بازنشانی گذرواژه
       link_expires: این پیوند ۱ ساعت دیگر منقضی خواهد شد.
-      ignore_request: اگر درخواستی برای تغییر رمز عبور خود نکرده‌اید، لطفا این ایمیل را نادیده بگیرید.
+      ignore_request: اگر درخواستی برای تغییر گذرواژه خود نکرده‌اید، لطفا این رایانامه را نادیده بگیرید.
   room:
     new_room_name: "اتاق %{username}"