Skip to content

Commit dde5b16

Browse files
sampaiodiegosampaiodiego
authored
Merge pull request #15941 from RocketChat/release-2.3.1
Release 2.3.1
2 parents 04ec7db + 4805dbe commit dde5b16

File tree

36 files changed

+387
-2982
lines changed

36 files changed

+387
-2982
lines changed

‎.docker/Dockerfile.rhel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
22

3-
ENV RC_VERSION 2.3.0
3+
ENV RC_VERSION 2.3.1
44

55
MAINTAINER [email protected]
66

‎.eslintignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ app/favico/favico.js
77
app/katex/client/katex/katex.min.js
88
packages/rocketchat-livechat/assets/rocketchat-livechat.min.js
99
packages/rocketchat-livechat/assets/rocket-livechat.js
10-
app/theme/client/minicolors/jquery.minicolors.js
1110
app/theme/client/vendor/
1211
app/ui/client/lib/customEventPolyfill.js
1312
app/ui/client/lib/Modernizr.js

‎.eslintrc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
"__meteor_bootstrap__" : false,
66
"__meteor_runtime_config__" : false,
77
"Assets" : false,
8-
"chrome" : false,
9-
"jscolor" : false
8+
"chrome" : false
109
},
1110
"plugins": ["react"],
1211
"rules": {

‎.github/history.json‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37204,6 +37204,72 @@
3720437204
]
3720537205
}
3720637206
]
37207+
},
37208+
"2.3.1": {
37209+
"node_version": "8.15.1",
37210+
"npm_version": "6.9.0",
37211+
"mongo_versions": [
37212+
"3.4",
37213+
"3.6",
37214+
"4.0"
37215+
],
37216+
"pull_requests": [
37217+
{
37218+
"pr": "15898",
37219+
"title": "[FIX] Default value of the Livechat WebhookUrl setting",
37220+
"userLogin": "renatobecker",
37221+
"milestone": "2.3.1",
37222+
"contributors": [
37223+
"renatobecker"
37224+
]
37225+
},
37226+
{
37227+
"pr": "15937",
37228+
"title": "[FIX] Admin menu not showing after renamed integration permissions",
37229+
"userLogin": "n-se",
37230+
"milestone": "2.3.1",
37231+
"contributors": [
37232+
"n-se"
37233+
]
37234+
},
37235+
{
37236+
"pr": "15934",
37237+
"title": "[FIX] Administration UI issues",
37238+
"userLogin": "tassoevan",
37239+
"milestone": "2.3.1",
37240+
"contributors": [
37241+
"tassoevan"
37242+
]
37243+
},
37244+
{
37245+
"pr": "15915",
37246+
"title": "[FIX] Livechat permissions being overwrite on server restart",
37247+
"userLogin": "renatobecker",
37248+
"milestone": "2.3.1",
37249+
"contributors": [
37250+
"renatobecker"
37251+
]
37252+
},
37253+
{
37254+
"pr": "15897",
37255+
"title": "[FIX] Livechat triggers not firing",
37256+
"userLogin": "renatobecker",
37257+
"milestone": "2.3.1",
37258+
"contributors": [
37259+
"renatobecker"
37260+
]
37261+
},
37262+
{
37263+
"pr": "15895",
37264+
"title": "[FIX] Auto load image user preference",
37265+
"userLogin": "ggazzo",
37266+
"milestone": "2.3.1",
37267+
"contributors": [
37268+
"ggazzo",
37269+
"web-flow"
37270+
]
37271+
}
37272+
]
3720737273
}
3720837274
}
3720937275
}

‎.travis/snap.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
1717
RC_VERSION=$TRAVIS_TAG
1818
else
1919
CHANNEL=edge
20-
RC_VERSION=2.3.0
20+
RC_VERSION=2.3.1
2121
fi
2222

2323
echo "Preparing to trigger a snap release for $CHANNEL channel"

‎HISTORY.md‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,31 @@
11

2+
# 2.3.1
3+
`2019-12-09 · 6 🐛 · 4 👩‍💻👨‍💻`
4+
5+
### Engine versions
6+
- Node: `8.15.1`
7+
- NPM: `6.9.0`
8+
- MongoDB: `3.4, 3.6, 4.0`
9+
10+
### 🐛 Bug fixes
11+
12+
- Default value of the Livechat WebhookUrl setting ([#15898](https://github.com/RocketChat/Rocket.Chat/pull/15898))
13+
- Admin menu not showing after renamed integration permissions ([#15937](https://github.com/RocketChat/Rocket.Chat/pull/15937) by [@n-se](https://github.com/n-se))
14+
- Administration UI issues ([#15934](https://github.com/RocketChat/Rocket.Chat/pull/15934))
15+
- Livechat permissions being overwrite on server restart ([#15915](https://github.com/RocketChat/Rocket.Chat/pull/15915))
16+
- Livechat triggers not firing ([#15897](https://github.com/RocketChat/Rocket.Chat/pull/15897))
17+
- Auto load image user preference ([#15895](https://github.com/RocketChat/Rocket.Chat/pull/15895))
18+
19+
### 👩‍💻👨‍💻 Contributors 😍
20+
21+
- [@n-se](https://github.com/n-se)
22+
23+
### 👩‍💻👨‍💻 Core Team 🤓
24+
25+
- [@ggazzo](https://github.com/ggazzo)
26+
- [@renatobecker](https://github.com/renatobecker)
27+
- [@tassoevan](https://github.com/tassoevan)
28+
229
# 2.3.0
330
`2019-11-27 · 13 🎉 · 17 🚀 · 26 🐛 · 19 🔍 · 25 👩‍💻👨‍💻`
431

‎app/authorization/server/startup.js‎

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,30 @@ Meteor.startup(function() {
8585
{ _id: 'view-outside-room', roles: ['admin', 'owner', 'moderator', 'user'] },
8686
{ _id: 'view-broadcast-member-list', roles: ['admin', 'owner', 'moderator'] },
8787
{ _id: 'call-management', roles: ['admin', 'owner', 'moderator'] },
88+
{ _id: 'view-l-room', roles: ['livechat-agent', 'livechat-manager', 'admin'] },
89+
{ _id: 'view-livechat-manager', roles: ['livechat-manager', 'admin'] },
90+
{ _id: 'view-livechat-rooms', roles: ['livechat-manager', 'admin'] },
91+
{ _id: 'close-livechat-room', roles: ['livechat-agent', 'livechat-manager', 'admin'] },
92+
{ _id: 'close-others-livechat-room', roles: ['livechat-manager', 'admin'] },
93+
{ _id: 'save-others-livechat-room-info', roles: ['livechat-manager'] },
94+
{ _id: 'remove-closed-livechat-rooms', roles: ['livechat-manager', 'admin'] },
95+
{ _id: 'view-livechat-analytics', roles: ['livechat-manager', 'admin'] },
96+
{ _id: 'view-livechat-queue', roles: ['livechat-manager', 'admin'] },
97+
{ _id: 'transfer-livechat-guest', roles: ['livechat-manager', 'admin'] },
98+
{ _id: 'manage-livechat-managers', roles: ['livechat-manager', 'admin'] },
99+
{ _id: 'manage-livechat-agents', roles: ['livechat-manager', 'admin'] },
100+
{ _id: 'manage-livechat-departments', roles: ['livechat-manager', 'admin'] },
101+
{ _id: 'view-livechat-departments', roles: ['livechat-manager', 'admin'] },
102+
{ _id: 'add-livechat-department-agents', roles: ['livechat-manager', 'admin'] },
103+
{ _id: 'view-livechat-current-chats', roles: ['livechat-manager', 'admin'] },
104+
{ _id: 'view-livechat-real-time-monitoring', roles: ['livechat-manager', 'admin'] },
105+
{ _id: 'view-livechat-triggers', roles: ['livechat-manager', 'admin'] },
106+
{ _id: 'view-livechat-customfields', roles: ['livechat-manager', 'admin'] },
107+
{ _id: 'view-livechat-installation', roles: ['livechat-manager', 'admin'] },
108+
{ _id: 'view-livechat-appearance', roles: ['livechat-manager', 'admin'] },
109+
{ _id: 'view-livechat-webhooks', roles: ['livechat-manager', 'admin'] },
110+
{ _id: 'view-livechat-facebook', roles: ['livechat-manager', 'admin'] },
111+
{ _id: 'view-livechat-officeHours', roles: ['livechat-manager', 'admin'] },
88112
];
89113

90114
for (const permission of permissions) {
@@ -94,14 +118,16 @@ Meteor.startup(function() {
94118
}
95119

96120
const defaultRoles = [
97-
{ name: 'admin', scope: 'Users', description: 'Admin' },
98-
{ name: 'moderator', scope: 'Subscriptions', description: 'Moderator' },
99-
{ name: 'leader', scope: 'Subscriptions', description: 'Leader' },
100-
{ name: 'owner', scope: 'Subscriptions', description: 'Owner' },
101-
{ name: 'user', scope: 'Users', description: '' },
102-
{ name: 'bot', scope: 'Users', description: '' },
103-
{ name: 'guest', scope: 'Users', description: '' },
104-
{ name: 'anonymous', scope: 'Users', description: '' },
121+
{ name: 'admin', scope: 'Users', description: 'Admin' },
122+
{ name: 'moderator', scope: 'Subscriptions', description: 'Moderator' },
123+
{ name: 'leader', scope: 'Subscriptions', description: 'Leader' },
124+
{ name: 'owner', scope: 'Subscriptions', description: 'Owner' },
125+
{ name: 'user', scope: 'Users', description: '' },
126+
{ name: 'bot', scope: 'Users', description: '' },
127+
{ name: 'guest', scope: 'Users', description: '' },
128+
{ name: 'anonymous', scope: 'Users', description: '' },
129+
{ name: 'livechat-agent', scope: 'Users', description: 'Livechat Agent' },
130+
{ name: 'livechat-manager', scope: 'Users', description: 'Livechat Manager' },
105131
];
106132

107133
for (const role of defaultRoles) {

‎app/lib/server/methods/removeOAuthService.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,6 @@ Meteor.methods({
4040
settings.removeById(`Accounts_OAuth_Custom-${ name }-roles_claim`);
4141
settings.removeById(`Accounts_OAuth_Custom-${ name }-merge_roles`);
4242
settings.removeById(`Accounts_OAuth_Custom-${ name }-merge_users`);
43+
settings.removeById(`Accounts_OAuth_Custom-${ name }-show_button`);
4344
},
4445
});

‎app/livechat/client/views/app/livechatAppearance.html‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@ <h2>{{_ "Settings"}}</h2>
1414
</div>
1515
<div class="input-line">
1616
<label for="color">{{_ "Title_bar_color"}}</label>
17-
<div>
18-
<input type="text" class="preview-settings colorpicker-input rc-input__element" name="color" id="color" value="{{color}}">
19-
<span class="colorpicker-swatch border-component-color" style="background-color: {{color}}"></span>
20-
</div>
17+
<input type="color" class="preview-settings rc-input__element" name="color" id="color" value="{{color}}" />
2118
</div>
2219
<div class="input-line">
2320
<label for="showAgentInfo">{{_ "Show_agent_Info"}}</label>
@@ -63,10 +60,7 @@ <h2>{{_ "Settings"}}</h2>
6360
</div>
6461
<div class="input-line">
6562
<label for="colorOffline">{{_ "Title_bar_color_offline"}}</label>
66-
<div>
67-
<input type="text" class="preview-settings colorpicker-input rc-input__element" name="colorOffline" id="colorOffline" value="{{colorOffline}}">
68-
<span class="colorpicker-swatch border-component-color" style="background-color: {{colorOffline}}"></span>
69-
</div>
63+
<input type="color" class="preview-settings rc-input__element" name="colorOffline" id="colorOffline" value="{{colorOffline}}" />
7064
</div>
7165
<div class="input-line">
7266
<label for="emailOffline">{{_ "Email_address_to_send_offline_messages"}}</label>

‎app/livechat/client/views/app/livechatAppearance.js‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint new-cap: ["error", { "newIsCapExceptions": ["jscolor"] }]*/
21
import { Meteor } from 'meteor/meteor';
32
import { ReactiveVar } from 'meteor/reactive-var';
43
import { Template } from 'meteor/templating';
@@ -312,11 +311,3 @@ Template.livechatAppearance.events({
312311
});
313312
},
314313
});
315-
316-
Template.livechatAppearance.onRendered(function() {
317-
Meteor.setTimeout(() => {
318-
$('.colorpicker-input').each((index, el) => {
319-
new jscolor(el);
320-
});
321-
}, 500);
322-
});

0 commit comments

Comments
 (0)