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

Chat locker 3 #18

Merged
merged 39 commits into from
Aug 2, 2015
Merged

Chat locker 3 #18

merged 39 commits into from
Aug 2, 2015

Conversation

berkich
Copy link

@berkich berkich commented Jul 31, 2015

No description provided.

Douglas Rapp and others added 30 commits July 21, 2015 10:42
- Modified 'directMessagesFlex' template to call the method whenever a target user is chosen, and then print out the resultant perms
removed security labels from channels and added labels to direct messages and private groups
Added chosen styles to match bootstrap 3
Added subscription to the 'room' publication for pulling relabel data
Added call to and created updatePrivateGroup
Put in the updateDirectMessage functionality
Requires relabelRoom method from issue 4
rename a room to an existing room's name
with the same name already exists.
…d in

room id.  Replaced it with code that retrieved the room from the session.
The roomObserve code detects ChatRoom subscription changes and updates the
session with key roomData + roomId.  Also set the room name and members
using the room object retrieve from the session.
consistency.  Unfortunately, we should really use the fullname, but we
can't because we're reusing this template to update a room and we
currently don't have a way to retrieve a full name from a username.
1. check that room creator is not removed
2. relabel room if access permissions changed
3. add new members that we're previously in the room
4. remove existing members that should no longer be in the room
… any permissions assigned to

them and is not restricted based on other members permissions.  Made this
change because of the UI.  we create a room and allow the user to specify
the members and access permissions at the same time.  it would be
confusing to constantly update the available access permissions every
time user is added/removed from the room.
…ll label data even if user hasn't 'entered' room yet
berkich and others added 9 commits July 30, 2015 11:13
…ssages

Fixed case where both members of direct message would get kicked on relabel
Comments
…ssage

in order to set security labels before creating the room.  Previously, the
right tab would create the direct message room (via createDirectMessage)
method then route to the new room.

Also removed the conversation button from the right flex tab when the user
is viewing themself because they can't talk to themselves.
use RocketChat error class. Label now displayed for SCI/SAP when user
doesn't have permissions of that type.  Previously we showed labels common
to all selected users.
private groups.  WHen updating a room, classifications of lower priority
are not displayed.  also fixed a bug where the selected classification
could not be reselected because it was disabled (select another
classification then try to reselect the original classification).
rwakida added a commit that referenced this pull request Aug 2, 2015
@rwakida rwakida merged commit 65c42db into master Aug 2, 2015
@bbrockman bbrockman modified the milestone: Product Backlog Aug 3, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants