Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Do not allow passwords on private channels #15642

Merged
merged 3 commits into from
May 12, 2020
Merged

[FIX] Do not allow passwords on private channels #15642

merged 3 commits into from
May 12, 2020

Conversation

MartinSchoeler
Copy link
Contributor

Closes #13750

@MartinSchoeler MartinSchoeler requested a review from ggazzo October 22, 2019 17:35
@ggazzo ggazzo added this to the 2.3.0 milestone Oct 22, 2019
@ggazzo ggazzo added the ui/ux label Oct 22, 2019
@@ -493,7 +493,7 @@ Template.channelSettingsEditing.onCreated(function() {
showingValue: new ReactiveVar(false),
realValue: null,
canView() {
return roomTypes.roomTypes[room.t].allowRoomSettingChange(room, RoomSettingsEnum.JOIN_CODE) && hasAllPermission('edit-room', room._id);
return room.t !== 'p' && roomTypes.roomTypes[room.t].allowRoomSettingChange(room, RoomSettingsEnum.JOIN_CODE) && hasAllPermission('edit-room', room._id);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please update allowRoomSettingChange for private channels

@engelgabriel engelgabriel modified the milestones: 2.3.0, 3.1.0 Mar 17, 2020
@CLAassistant
Copy link

CLA assistant check
All committers have signed the CLA.

@engelgabriel engelgabriel modified the milestones: 3.1.0, 3.2.0 Apr 20, 2020
@engelgabriel
Copy link
Member

@ggazzo can please you reprioritize this?

@engelgabriel engelgabriel modified the milestones: 3.2.0, 3.3.0 May 7, 2020
@ggazzo ggazzo merged commit 8ab8951 into develop May 12, 2020
@ggazzo ggazzo deleted the fix-joincode branch May 12, 2020 22:21
gabriellsh added a commit that referenced this pull request May 13, 2020
… integrations

* 'integrations' of github.com:RocketChat/Rocket.Chat:
  [NEW] Add Permissions to deal with Omnichannel visitor past chats history (#17580)
  [NEW] Add permissions to deal with Omnichannel custom fields (#17567)
  [FIX] Livechat iframe allow microphone and camera (#9956)
  [FIX] Do not allow passwords on private channels (#15642)
  [FIX] Mail Messages > Cannot mail own user. (#17625)
  [FIX] remove multiple options from dontAskMeAgain (#17514)
  [FIX] Notification sounds (#17616)
  [FIX] Resolve 'app already exists' error on app update (#17544)
  [NEW] Unread bars on sidebar (#16862)
  [FIX] Relative image path in oembededUrlWidget (#15902)
  Regression: Do not show custom status inside sequential messages (#17613)
ggazzo added a commit that referenced this pull request May 16, 2020
* 'develop' of github.com:RocketChat/Rocket.Chat: (25 commits)
  [FIX] Not redirecting to `First Channel After Login` on register (#17664)
  Regression: Pressing enter on search reloads the page - admin pages (#17663)
  [NEW] Admin refactor  Second phase (#17551)
  [IMPROVE] Unused styles (#17554)
  [FIX] Directory search user placeholder (#17652)
  [NEW] Added "Add custom emoji" link to emoji picker (#16250)
  [FIX] Marketplace tiered pricing plan wording (#17644)
  [FIX] Secret Registration not properly validating Invite Token (#17618)
  Improve: New PR Template (#16968)
  Add engine versions for houston with templates (#17403)
  Use Users.findOneByAppId instead of querying directly (#16480)
  Remove unnecessary setting redefinition (#17587)
  Deprecate compatibility cordova setting (#17586)
  Hyper.sh went out of business in early 2019 (#17622)
  [NEW] Add Permissions to deal with Omnichannel visitor past chats history (#17580)
  [NEW] Add permissions to deal with Omnichannel custom fields (#17567)
  [FIX] Livechat iframe allow microphone and camera (#9956)
  [FIX] Do not allow passwords on private channels (#15642)
  [FIX] Mail Messages > Cannot mail own user. (#17625)
  [FIX] remove multiple options from dontAskMeAgain (#17514)
  ...
This was referenced May 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

password for private group
4 participants