Merge branch 'develop' into fix/login-services-button-props

RocketChat · Jul 9, 2024 · 482a326 · 482a326
2 parents 74315c4 + ca3d90b
commit 482a326
Show file tree

Hide file tree

Showing 42 changed files with 0 additions and 0 deletions.
diff --git a/apps/meteor/tests/end-to-end/api/26-LDAP.ts → apps/meteor/tests/end-to-end/api/LDAP.ts b/apps/meteor/tests/end-to-end/api/26-LDAP.ts → apps/meteor/tests/end-to-end/api/LDAP.ts
diff --git a/.../meteor/tests/end-to-end/api/32-assets.ts → apps/meteor/tests/end-to-end/api/assets.ts b/.../meteor/tests/end-to-end/api/32-assets.ts → apps/meteor/tests/end-to-end/api/assets.ts
diff --git a/.../meteor/tests/end-to-end/api/14-assets.ts → apps/meteor/tests/end-to-end/api/assets2.ts b/.../meteor/tests/end-to-end/api/14-assets.ts → apps/meteor/tests/end-to-end/api/assets2.ts
diff --git a/.../tests/end-to-end/api/00-autotranslate.ts → ...eor/tests/end-to-end/api/autotranslate.ts b/.../tests/end-to-end/api/00-autotranslate.ts → ...eor/tests/end-to-end/api/autotranslate.ts
diff --git a/...meteor/tests/end-to-end/api/21-banners.ts → apps/meteor/tests/end-to-end/api/banners.ts b/...meteor/tests/end-to-end/api/21-banners.ts → apps/meteor/tests/end-to-end/api/banners.ts
diff --git a/...eteor/tests/end-to-end/api/30-calendar.ts → apps/meteor/tests/end-to-end/api/calendar.ts b/...eteor/tests/end-to-end/api/30-calendar.ts → apps/meteor/tests/end-to-end/api/calendar.ts
diff --git a/...eteor/tests/end-to-end/api/02-channels.ts → apps/meteor/tests/end-to-end/api/channels.ts b/...eteor/tests/end-to-end/api/02-channels.ts → apps/meteor/tests/end-to-end/api/channels.ts
diff --git a/apps/meteor/tests/end-to-end/api/05-chat.ts → apps/meteor/tests/end-to-end/api/chat.ts b/apps/meteor/tests/end-to-end/api/05-chat.ts → apps/meteor/tests/end-to-end/api/chat.ts
diff --git a/...eteor/tests/end-to-end/api/16-commands.ts → apps/meteor/tests/end-to-end/api/commands.ts b/...eteor/tests/end-to-end/api/16-commands.ts → apps/meteor/tests/end-to-end/api/commands.ts
diff --git a/.../tests/end-to-end/api/17-custom-sounds.ts → ...eor/tests/end-to-end/api/custom-sounds.ts b/.../tests/end-to-end/api/17-custom-sounds.ts → ...eor/tests/end-to-end/api/custom-sounds.ts
diff --git a/...s/end-to-end/api/17-custom-user-status.ts → ...ests/end-to-end/api/custom-user-status.ts b/...s/end-to-end/api/17-custom-user-status.ts → ...ests/end-to-end/api/custom-user-status.ts
diff --git a/...tests/end-to-end/api/04-direct-message.ts → ...or/tests/end-to-end/api/direct-message.ts b/...tests/end-to-end/api/04-direct-message.ts → ...or/tests/end-to-end/api/direct-message.ts
diff --git a/...r/tests/end-to-end/api/12-emoji-custom.ts → ...teor/tests/end-to-end/api/emoji-custom.ts b/...r/tests/end-to-end/api/12-emoji-custom.ts → ...teor/tests/end-to-end/api/emoji-custom.ts
diff --git a/...nd-to-end/api/31-failed-login-attempts.ts → ...s/end-to-end/api/failed-login-attempts.ts b/...nd-to-end/api/31-failed-login-attempts.ts → ...s/end-to-end/api/failed-login-attempts.ts
diff --git a/...eor/tests/end-to-end/api/33-federation.ts → ...meteor/tests/end-to-end/api/federation.ts b/...eor/tests/end-to-end/api/33-federation.ts → ...meteor/tests/end-to-end/api/federation.ts
diff --git a/.../meteor/tests/end-to-end/api/03-groups.ts → apps/meteor/tests/end-to-end/api/groups.ts b/.../meteor/tests/end-to-end/api/03-groups.ts → apps/meteor/tests/end-to-end/api/groups.ts
diff --git a/...nd-to-end/api/07-incoming-integrations.ts → ...s/end-to-end/api/incoming-integrations.ts b/...nd-to-end/api/07-incoming-integrations.ts → ...s/end-to-end/api/incoming-integrations.ts
diff --git a/...meteor/tests/end-to-end/api/23-invites.ts → apps/meteor/tests/end-to-end/api/invites.ts b/...meteor/tests/end-to-end/api/23-invites.ts → apps/meteor/tests/end-to-end/api/invites.ts
diff --git a/...eteor/tests/end-to-end/api/20-licenses.ts → apps/meteor/tests/end-to-end/api/licenses.ts b/...eteor/tests/end-to-end/api/20-licenses.ts → apps/meteor/tests/end-to-end/api/licenses.ts
diff --git a/...meteor/tests/end-to-end/api/24-methods.ts → apps/meteor/tests/end-to-end/api/methods.ts b/...meteor/tests/end-to-end/api/24-methods.ts → apps/meteor/tests/end-to-end/api/methods.ts
diff --git a/.../tests/end-to-end/api/00-miscellaneous.ts → ...eor/tests/end-to-end/api/miscellaneous.ts b/.../tests/end-to-end/api/00-miscellaneous.ts → ...eor/tests/end-to-end/api/miscellaneous.ts
diff --git a/...eor/tests/end-to-end/api/27-moderation.ts → ...meteor/tests/end-to-end/api/moderation.ts b/...eor/tests/end-to-end/api/27-moderation.ts → ...meteor/tests/end-to-end/api/moderation.ts
diff --git a/...r/tests/end-to-end/api/29-oauth-server.ts → ...teor/tests/end-to-end/api/oauth-server.ts b/...r/tests/end-to-end/api/29-oauth-server.ts → ...teor/tests/end-to-end/api/oauth-server.ts
diff --git a/...teor/tests/end-to-end/api/18-oauthapps.ts → .../meteor/tests/end-to-end/api/oauthapps.ts b/...teor/tests/end-to-end/api/18-oauthapps.ts → .../meteor/tests/end-to-end/api/oauthapps.ts
diff --git a/...nd-to-end/api/06-outgoing-integrations.ts → ...s/end-to-end/api/outgoing-integrations.ts b/...nd-to-end/api/06-outgoing-integrations.ts → ...s/end-to-end/api/outgoing-integrations.ts
diff --git a/...or/tests/end-to-end/api/11-permissions.ts → ...eteor/tests/end-to-end/api/permissions.ts b/...or/tests/end-to-end/api/11-permissions.ts → ...eteor/tests/end-to-end/api/permissions.ts
diff --git a/...eteor/tests/end-to-end/api/27-presence.ts → apps/meteor/tests/end-to-end/api/presence.ts b/...eteor/tests/end-to-end/api/27-presence.ts → apps/meteor/tests/end-to-end/api/presence.ts
diff --git a/apps/meteor/tests/end-to-end/api/22-push.ts → apps/meteor/tests/end-to-end/api/push.ts b/apps/meteor/tests/end-to-end/api/22-push.ts → apps/meteor/tests/end-to-end/api/push.ts
diff --git a/apps/meteor/tests/end-to-end/api/28-roles.ts → apps/meteor/tests/end-to-end/api/roles.ts b/apps/meteor/tests/end-to-end/api/28-roles.ts → apps/meteor/tests/end-to-end/api/roles.ts
diff --git a/apps/meteor/tests/end-to-end/api/09-rooms.ts → apps/meteor/tests/end-to-end/api/rooms.ts b/apps/meteor/tests/end-to-end/api/09-rooms.ts → apps/meteor/tests/end-to-end/api/rooms.ts
diff --git a/...eteor/tests/end-to-end/api/08-settings.ts → apps/meteor/tests/end-to-end/api/settings.ts b/...eteor/tests/end-to-end/api/08-settings.ts → apps/meteor/tests/end-to-end/api/settings.ts
diff --git a/...eor/tests/end-to-end/api/19-statistics.ts → ...meteor/tests/end-to-end/api/statistics.ts b/...eor/tests/end-to-end/api/19-statistics.ts → ...meteor/tests/end-to-end/api/statistics.ts
diff --git a/.../tests/end-to-end/api/10-subscriptions.ts → ...eor/tests/end-to-end/api/subscriptions.ts b/.../tests/end-to-end/api/10-subscriptions.ts → ...eor/tests/end-to-end/api/subscriptions.ts
diff --git a/apps/meteor/tests/end-to-end/api/25-teams.ts → apps/meteor/tests/end-to-end/api/teams.ts b/apps/meteor/tests/end-to-end/api/25-teams.ts → apps/meteor/tests/end-to-end/api/teams.ts
diff --git a/apps/meteor/tests/end-to-end/api/01-users.ts → apps/meteor/tests/end-to-end/api/users.ts b/apps/meteor/tests/end-to-end/api/01-users.ts → apps/meteor/tests/end-to-end/api/users.ts
diff --git a/.../meteor/tests/end-to-end/api/17-webdav.ts → apps/meteor/tests/end-to-end/api/webdav.ts b/.../meteor/tests/end-to-end/api/17-webdav.ts → apps/meteor/tests/end-to-end/api/webdav.ts
diff --git a/.../tests/end-to-end/apps/00-installation.ts → ...eor/tests/end-to-end/apps/installation.ts b/.../tests/end-to-end/apps/00-installation.ts → ...eor/tests/end-to-end/apps/installation.ts
diff --git a/...d-to-end/apps/02-send-messages-as-user.ts → .../end-to-end/apps/send-messages-as-user.ts b/...d-to-end/apps/02-send-messages-as-user.ts → .../end-to-end/apps/send-messages-as-user.ts
diff --git a/...tests/end-to-end/apps/01-send-messages.ts → ...or/tests/end-to-end/apps/send-messages.ts b/...tests/end-to-end/apps/01-send-messages.ts → ...or/tests/end-to-end/apps/send-messages.ts
diff --git a/...-end/apps/03-slash-command-test-simple.ts → ...-to-end/apps/slash-command-test-simple.ts b/...-end/apps/03-slash-command-test-simple.ts → ...-to-end/apps/slash-command-test-simple.ts
diff --git a/...s/04-slash-command-test-with-arguments.ts → ...apps/slash-command-test-with-arguments.ts b/...s/04-slash-command-test-with-arguments.ts → ...apps/slash-command-test-with-arguments.ts
diff --git a/...s/end-to-end/apps/05-video-conferences.ts → ...ests/end-to-end/apps/video-conferences.ts b/...s/end-to-end/apps/05-video-conferences.ts → ...ests/end-to-end/apps/video-conferences.ts