Skip to content

Commit 7df9818

Browse files
sampaiodiegosampaiodiego
authored
Merge pull request #12026 from RocketChat/release-0.69.2
Release 0.69.2
2 parents ed7ab02 + 5dcbe15 commit 7df9818

File tree

19 files changed

+331
-109
lines changed

19 files changed

+331
-109
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 0.69.1
3+
ENV RC_VERSION 0.69.2
44

55
MAINTAINER [email protected]
66

‎.github/history.json‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18679,6 +18679,59 @@
1867918679
]
1868018680
}
1868118681
]
18682+
},
18683+
"0.69.2": {
18684+
"node_version": "8.11.3",
18685+
"npm_version": "5.6.0",
18686+
"pull_requests": [
18687+
{
18688+
"pr": "11812",
18689+
"title": "[NEW] Include room name in stream for bots",
18690+
"userLogin": "timkinnane",
18691+
"milestone": "0.69.2",
18692+
"contributors": [
18693+
"timkinnane",
18694+
"sampaiodiego",
18695+
"web-flow"
18696+
]
18697+
},
18698+
{
18699+
"pr": "12022",
18700+
"title": "[FIX] Reset password link error if already logged in",
18701+
"userLogin": "rodrigok",
18702+
"milestone": "0.69.2",
18703+
"contributors": [
18704+
"rodrigok"
18705+
]
18706+
},
18707+
{
18708+
"pr": "11992",
18709+
"title": "[FIX] Apps: setting with 'code' type only saving last line",
18710+
"userLogin": "cardoso",
18711+
"milestone": "0.69.2",
18712+
"contributors": [
18713+
"cardoso"
18714+
]
18715+
},
18716+
{
18717+
"pr": "11955",
18718+
"title": "[FIX] Update user information not possible by admin if disabled to users",
18719+
"userLogin": "kaiiiiiiiii",
18720+
"milestone": "0.69.2",
18721+
"contributors": [
18722+
"kaiiiiiiiii"
18723+
]
18724+
},
18725+
{
18726+
"pr": "12025",
18727+
"title": "[FIX] Hidden admin sidenav on embedded layout",
18728+
"userLogin": "ggazzo",
18729+
"milestone": "0.69.2",
18730+
"contributors": [
18731+
"ggazzo"
18732+
]
18733+
}
18734+
]
1868218735
}
1868318736
}
1868418737
}

‎.sandstorm/sandstorm-pkgdef.capnp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
1919

2020
appTitle = (defaultText = "Rocket.Chat"),
2121

22-
appVersion = 96, # Increment this for every release.
22+
appVersion = 97, # Increment this for every release.
2323

24-
appMarketingVersion = (defaultText = "0.69.1"),
24+
appMarketingVersion = (defaultText = "0.69.2"),
2525
# Human-readable representation of appVersion. Should match the way you
2626
# identify versions of your app in documentation and marketing.
2727

‎.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=0.69.1
20+
RC_VERSION=0.69.2
2121
fi
2222

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

‎HISTORY.md‎

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

2+
# 0.69.2
3+
`2018-09-11 · 1 🎉 · 4 🐛 · 6 👩‍💻👨‍💻`
4+
5+
### Engine versions
6+
- Node: `8.11.3`
7+
- NPM: `5.6.0`
8+
9+
### 🎉 New features
10+
11+
- Include room name in stream for bots ([#11812](https://github.com/RocketChat/Rocket.Chat/pull/11812))
12+
13+
### 🐛 Bug fixes
14+
15+
- Reset password link error if already logged in ([#12022](https://github.com/RocketChat/Rocket.Chat/pull/12022))
16+
- Apps: setting with 'code' type only saving last line ([#11992](https://github.com/RocketChat/Rocket.Chat/pull/11992))
17+
- Update user information not possible by admin if disabled to users ([#11955](https://github.com/RocketChat/Rocket.Chat/pull/11955) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
18+
- Hidden admin sidenav on embedded layout ([#12025](https://github.com/RocketChat/Rocket.Chat/pull/12025))
19+
20+
### 👩‍💻👨‍💻 Contributors 😍
21+
22+
- [@kaiiiiiiiii](https://github.com/kaiiiiiiiii)
23+
24+
### 👩‍💻👨‍💻 Core Team 🤓
25+
26+
- [@cardoso](https://github.com/cardoso)
27+
- [@ggazzo](https://github.com/ggazzo)
28+
- [@rodrigok](https://github.com/rodrigok)
29+
- [@sampaiodiego](https://github.com/sampaiodiego)
30+
- [@timkinnane](https://github.com/timkinnane)
31+
232
# 0.69.1
333
`2018-08-31 · 4 🐛 · 2 👩‍💻👨‍💻`
434

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Rocket.Chat",
33
"description": "The Ultimate Open Source WebChat Platform",
4-
"version": "0.69.1",
4+
"version": "0.69.2",
55
"author": {
66
"name": "Rocket.Chat",
77
"url": "https://rocket.chat/"

‎packages/rocketchat-apps/client/admin/appManage.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ <h2> {{_ "Settings"}} </h2>
245245
<div class="rc-input__title">{{_ i18nLabel}}</div>
246246
<div class="rc-input__wrapper">
247247
{{#if isDisabled.disabled}}
248-
{{> CodeMirror name=id options=(getEditorOptions true) code=(i18nDefaultValue) }}
248+
{{> CodeMirror name=id options=(getEditorOptions true) code=(i18nDefaultValue) }}
249249
{{else}}
250250
<div class="code-mirror-box" data-editor-id="{{id}}">
251251
<div class="title">

‎packages/rocketchat-apps/client/admin/appManage.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,12 +388,16 @@ Template.appManage.events({
388388

389389
'input input, input textarea, change input[type="color"]': _.throttle(function(e, t) {
390390
let value = s.trim($(e.target).val());
391+
391392
switch (this.type) {
392393
case 'int':
393394
value = parseInt(value);
394395
break;
395396
case 'boolean':
396397
value = value === '1';
398+
break;
399+
case 'code':
400+
value = $(`.code-mirror-box[data-editor-id="${ this.id }"] .CodeMirror`)[0].CodeMirror.getValue();
397401
}
398402

399403
const setting = t.settings.get()[this.id];

‎packages/rocketchat-lib/rocketchat.info‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"version": "0.69.1",
2+
"version": "0.69.2",
33
"marketplaceApiVersion": "1.0.0"
44
}

‎packages/rocketchat-lib/server/functions/saveUser.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,35 +179,35 @@ RocketChat.saveUser = function(userId, userData) {
179179

180180
return _id;
181181
} else {
182-
if (!RocketChat.settings.get('Accounts_AllowUserProfileChange')) {
182+
if (!RocketChat.settings.get('Accounts_AllowUserProfileChange') && !RocketChat.authz.hasPermission(userId, 'edit-other-user-info') && !RocketChat.authz.hasPermission(userId, 'edit-other-user-password')) {
183183
throw new Meteor.Error('error-action-not-allowed', 'Edit user profile is not allowed', {
184184
method: 'insertOrUpdateUser',
185185
action: 'Update_user',
186186
});
187187
}
188188

189-
if (userData.username && !RocketChat.settings.get('Accounts_AllowUsernameChange')) {
189+
if (userData.username && !RocketChat.settings.get('Accounts_AllowUsernameChange') && !RocketChat.authz.hasPermission(userId, 'edit-other-user-info')) {
190190
throw new Meteor.Error('error-action-not-allowed', 'Edit username is not allowed', {
191191
method: 'insertOrUpdateUser',
192192
action: 'Update_user',
193193
});
194194
}
195195

196-
if (userData.name && !RocketChat.settings.get('Accounts_AllowRealNameChange')) {
196+
if (userData.name && !RocketChat.settings.get('Accounts_AllowRealNameChange') && !RocketChat.authz.hasPermission(userId, 'edit-other-user-info')) {
197197
throw new Meteor.Error('error-action-not-allowed', 'Edit user real name is not allowed', {
198198
method: 'insertOrUpdateUser',
199199
action: 'Update_user',
200200
});
201201
}
202202

203-
if (userData.email && !RocketChat.settings.get('Accounts_AllowEmailChange')) {
203+
if (userData.email && !RocketChat.settings.get('Accounts_AllowEmailChange') && !RocketChat.authz.hasPermission(userId, 'edit-other-user-info')) {
204204
throw new Meteor.Error('error-action-not-allowed', 'Edit user email is not allowed', {
205205
method: 'insertOrUpdateUser',
206206
action: 'Update_user',
207207
});
208208
}
209209

210-
if (userData.password && !RocketChat.settings.get('Accounts_AllowPasswordChange')) {
210+
if (userData.password && !RocketChat.settings.get('Accounts_AllowPasswordChange') && !RocketChat.authz.hasPermission(userId, 'edit-other-user-password')) {
211211
throw new Meteor.Error('error-action-not-allowed', 'Edit user password is not allowed', {
212212
method: 'insertOrUpdateUser',
213213
action: 'Update_user',

0 commit comments

Comments
 (0)