Skip to content

Commit 7cb736b

Browse files
ggazzoggazzo
committed
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into ref/omni-curr-chats
2 parents d7840be + 7d60bee commit 7cb736b

File tree

57 files changed

+9199
-6587
lines changed

Some content is hidden

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

57 files changed

+9199
-6587
lines changed

‎.github/issue-close-app.yml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,25 @@
11
# Config for Close Issue app: https://probot.github.io/apps/close-issue/
22

33
# Comment that will be sent if an issue is judged to be closed
4-
comment: "This issue was closed because it does not use any of our issue templates. Please make sure to use one of the suggested templates."
4+
comment: |
5+
This issue was closed because it does not use our bug report issue template.
6+
7+
Please make sure to use it and fill it as much as you can so we can provide better and faster support.
8+
9+
The following sections **must not** be removed, or else the BOT will close it immediately again:
10+
11+
* Steps to reproduce
12+
* Expected behavior
13+
* Actual behavior
14+
* Server Setup Information
515
issueConfigs:
616
# There can be several configs for different kind of issues.
717
- content:
818
# Bug report
919
- "Steps to reproduce"
1020
- "Expected behavior"
1121
- "Actual behavior"
22+
- "Server Setup Information"
1223
- "Version of Rocket.Chat Server"
1324
- content:
1425
# Release issue

‎.github/workflows/build_and_test.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,9 @@ jobs:
238238
MONGO_URL: mongodb://localhost:27017/rocketchat
239239
MONGO_OPLOG_URL: mongodb://localhost:27017/local
240240
run: |
241-
for i in $(seq 1 5); do (docker exec mongo mongo rocketchat --eval 'db.dropDatabase()') && xvfb-run --auto-servernum npm run testci && s=0 && break || s=$? && sleep 1; done; (exit $s)
241+
echo -e 'pcm.!default {\n type hw\n card 0\n}\n\nctl.!default {\n type hw\n card 0\n}' > ~/.asoundrc
242+
Xvfb -screen 0 1024x768x24 :99 &
243+
for i in $(seq 1 5); do (docker exec mongo mongo rocketchat --eval 'db.dropDatabase()') && npm run testci && s=0 && break || s=$? && sleep 1; done; (exit $s)
242244
243245
# notification:
244246
# runs-on: ubuntu-latest

‎.meteor/versions‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ [email protected]
44
[email protected]
55
[email protected]
66
[email protected]
7-
[email protected].0
7+
[email protected].1
88
[email protected]
99
aldeed:[email protected]
1010
[email protected]
@@ -27,8 +27,8 @@ dandv:[email protected]
2727
[email protected]
2828
[email protected]
2929
[email protected]
30-
[email protected].7
31-
[email protected].1
30+
[email protected].8
31+
[email protected].2
3232
deepwell:[email protected]
3333
[email protected]
3434
[email protected]
@@ -79,7 +79,7 @@ [email protected]
7979
[email protected]
8080
meteorhacks:[email protected]
8181
meteorspark:[email protected]
82-
[email protected].0
82+
[email protected].2
8383
[email protected]
8484
[email protected]
8585
mizzao:[email protected]
@@ -97,7 +97,7 @@ mystor:[email protected]
9797
nimble:[email protected]
9898
nooitaf:[email protected]_1
9999
[email protected]
100-
[email protected].0
100+
[email protected].1
101101
[email protected]
102102
[email protected]
103103
[email protected]
@@ -130,7 +130,7 @@ [email protected]
130130
[email protected]
131131
[email protected]
132132
simple:[email protected]
133-
[email protected].0
133+
[email protected].1
134134
[email protected]
135135
[email protected]
136136
[email protected]

‎app/authentication/server/startup/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Accounts.onCreateUser(function(options, user = {}) {
153153
callbacks.run('beforeCreateUser', options, user);
154154

155155
user.status = 'offline';
156-
user.active = !settings.get('Accounts_ManuallyApproveNewUsers');
156+
user.active = user.active !== undefined ? user.active : !settings.get('Accounts_ManuallyApproveNewUsers');
157157

158158
if (!user.name) {
159159
if (options.profile) {

‎app/authorization/client/views/permissions.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import { hasAllPermission } from '../hasPermission';
1111
import { t } from '../../../utils/client';
1212
import { SideNav } from '../../../ui-utils/client/lib/SideNav';
1313
import { CONSTANTS, AuthorizationUtils } from '../../lib';
14-
1514
import { hasAtLeastOnePermission } from '..';
1615

1716
Template.permissions.helpers({

‎app/authorization/server/startup.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Meteor.startup(function() {
2424
{ _id: 'assign-roles', roles: ['admin'] },
2525
{ _id: 'ban-user', roles: ['admin', 'owner', 'moderator'] },
2626
{ _id: 'bulk-register-user', roles: ['admin'] },
27+
{ _id: 'change-livechat-room-visitor', roles: ['admin', 'livechat-manager', 'livechat-agent'] },
2728
{ _id: 'create-c', roles: ['admin', 'user', 'bot', 'app'] },
2829
{ _id: 'create-d', roles: ['admin', 'user', 'bot', 'app'] },
2930
{ _id: 'create-p', roles: ['admin', 'user', 'bot', 'app'] },

‎app/autotranslate/server/methods/getSupportedLanguages.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { Meteor } from 'meteor/meteor';
22
import { DDPRateLimiter } from 'meteor/ddp-rate-limiter';
33

44
import { hasPermission } from '../../../authorization';
5-
65
import { TranslationProviderRegistry } from '..';
76

87
Meteor.methods({

‎app/autotranslate/server/methods/translateMessage.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { Meteor } from 'meteor/meteor';
22

33
import { Rooms } from '../../../models';
4-
54
import { TranslationProviderRegistry } from '..';
65

76
Meteor.methods({

‎app/e2e/client/rocketchat.e2e.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,8 +481,10 @@ class E2E {
481481
}
482482

483483
closeAlert() {
484+
if (showingE2EAlert) {
485+
alerts.close();
486+
}
484487
showingE2EAlert = false;
485-
alerts.close();
486488
}
487489
}
488490

‎app/importer/server/methods/downloadPublicImportFile.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { Meteor } from 'meteor/meteor';
77
import { RocketChatImportFileInstance } from '../startup/store';
88
import { ProgressStep } from '../../lib/ImporterProgressStep';
99
import { hasPermission } from '../../../authorization';
10-
1110
import { Importers } from '..';
1211

1312
function downloadHttpFile(fileUrl, writeStream) {

0 commit comments

Comments
 (0)