Skip to content

Commit 26bb2d0

Browse files
authored
Merge branch 'develop' into poc/videoSharing
2 parents 81af4bb + b8b8611 commit 26bb2d0

File tree

240 files changed

+1436
-1134
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

240 files changed

+1436
-1134
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
'@rocket.chat/fuselage-ui-kit': minor
3+
'@rocket.chat/ui-kit': major
4+
'@rocket.chat/apps-engine': minor
5+
'@rocket.chat/livechat': minor
6+
'@rocket.chat/meteor': minor
7+
---
8+
9+
refactor(ui-kit): Remove UiKit deprecations
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@rocket.chat/meteor": minor
3+
"@rocket.chat/rest-typings": minor
4+
---
5+
6+
Add OpenAPI support for the chat.followMessage and chat.unfollowMessage API endpoints by migrating to a modern chained route definition syntax and utilizing AJV schemas for body and response validation.

.changeset/tame-dolphins-draw.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@rocket.chat/meteor": patch
3+
---
4+
5+
Fixes `inquiries.take` not failing when attempting to take a chat while over chat limits

.github/actions/build-docker/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ runs:
166166
retention-days: 1
167167

168168
- uses: actions/upload-artifact@v4
169-
if: inputs.publish-image == 'true' && inputs.arch == 'amd64'
169+
if: inputs.publish-image == 'true'
170170
with:
171171
name: manifests-${{ inputs.service }}-${{ inputs.arch }}-${{ inputs.type }}
172172
path: /tmp/manifests

.github/pr-title-checker-config.json

Lines changed: 0 additions & 13 deletions
This file was deleted.

.github/workflows/pr-title-checker.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

apps/meteor/app/2fa/server/code/EmailCheck.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,13 @@ ${t('If_you_didnt_try_to_login_in_your_account_please_ignore_this_email')}
101101
const random = Random._randomString(6, '0123456789');
102102
const encryptedRandom = await bcrypt.hash(random, Accounts._bcryptRounds());
103103
const expire = new Date();
104-
const expirationInSeconds = parseInt(settings.get('Accounts_TwoFactorAuthentication_By_Email_Code_Expiration') as string, 10);
104+
const expirationInSeconds = parseInt(settings.get('Accounts_TwoFactorAuthentication_By_Email_Code_Expiration'), 10);
105105

106106
expire.setSeconds(expire.getSeconds() + expirationInSeconds);
107107

108108
await Users.addEmailCodeByUserId(user._id, encryptedRandom, expire);
109109

110-
for await (const address of emails) {
110+
for (const address of emails) {
111111
await this.send2FAEmail(address, random, user);
112112
}
113113
}

apps/meteor/app/2fa/server/code/PasswordCheckFallback.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import type { IUser } from '@rocket.chat/core-typings';
22
import { Accounts } from 'meteor/accounts-base';
3+
import type { Meteor } from 'meteor/meteor';
34

45
import type { ICodeCheck, IProcessInvalidCodeResult } from './ICodeCheck';
56
import { settings } from '../../../settings/server';

apps/meteor/app/2fa/server/functions/resetTOTP.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const sendResetNotification = async function (uid: string): Promise<void> {
3636
const from = settings.get('From_Email');
3737
const subject = t('TOTP_reset_email');
3838

39-
for await (const address of addresses) {
39+
for (const address of addresses) {
4040
try {
4141
await Mailer.send({
4242
to: address,

apps/meteor/app/2fa/server/methods/validateTempToken.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import type { ServerMethods } from '@rocket.chat/ddp-client';
22
import { Users } from '@rocket.chat/models';
3+
import { Accounts } from 'meteor/accounts-base';
34
import { Meteor } from 'meteor/meteor';
45

56
import { notifyOnUserChange, notifyOnUserChangeAsync } from '../../../lib/server/lib/notifyListener';

0 commit comments

Comments
 (0)