Upstream merge #582
Closed
Upstream merge #582
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Uses proprietary LDAP classes that retrieve user data from LDAP. Eventually need to replace with rocketchat-ldap code once it matures. - Registers login handler that authenticates againist LDAP - Import defeault settings that contains LDAP configuration.
RocketChat adds new users to the GENERAL channel as part of the registration process (when setting username). Unfortunately, we pre-load the users from LDAP and do not allow them to set their username which skips the code that adds them to GENERAL channel. Thus, we need to add them to the GENERAL channel when we pre-load the users. Also, we can't re-use RocketChat's code because their method assumes that a user is logged in, but our code is run at startup and has no user.
login. User information is pre-loaded at startup and refreshed at login. However, the upsert method overwrote the user object instead of individual fields. This was evident after the intial login. The initial login correctly asked for an avatar and set a corresponding field. However, on subsequent logins, the user was prompted for an avatar again because the ldap values overwrote the user and deleted the avatar field.
Integrate LDAP into RocketChat
- Banner text and classification is retrieved from the server - Added ReactiveDict package - Added the AccessPermission class from previous app - Included the as-yet non-existent 'accessPermissions' field to the list of chat room fields published to client
…s added with improper name.
Feature/chat locker 6.1
Feature/chat locker 6
Conflicts: client/views/app/sideNav/directMessagesFlex.coffee client/views/app/sideNav/privateGroupsFlex.coffee client/views/app/userSearch.html
SideNav), and message typing updates (bottom of room)
Room opens SideNav flex to edit security labels only for direct message and private groups. It passes boolean to security banner template that shows cursor 'pointer' when in private group or direct message. Otherwise, css displays default cursor.
Conflicts: client/views/app/room.coffee client/views/app/room.html
- lists of selected/drop-down users now include username in 'data-username' attr - code handling styling checks against this attribute instead of text content (full name)
Updated privateGroupsFlex and userSearch templates
Conflicts: .meteor/packages .meteor/versions .travis.yml README.md build-android.sh build-ios.sh build.sh client/lib/RoomManager.coffee client/lib/fileUpload.coffee client/routes/roomRoute.coffee client/routes/router.coffee client/stylesheets/base.less client/stylesheets/global/_variables.less client/views/admin/admin.html client/views/admin/adminStatistics.coffee client/views/admin/adminStatistics.html client/views/admin/users/adminUserChannels.coffee client/views/admin/users/adminUserChannels.html client/views/admin/users/adminUserInfo.coffee client/views/admin/users/adminUserInfo.html client/views/admin/users/adminUsers.coffee client/views/admin/users/adminUsers.html client/views/app/home.html client/views/app/message.coffee client/views/app/room.coffee client/views/app/room.html client/views/app/sideNav/chatRoomItem.coffee client/views/app/sideNav/createChannelFlex.coffee client/views/app/sideNav/directMessages.coffee client/views/app/sideNav/directMessagesFlex.coffee client/views/app/sideNav/directMessagesFlex.html client/views/app/sideNav/privateGroupsFlex.coffee client/views/app/sideNav/sideNav.coffee client/views/app/sideNav/sideNav.html client/views/app/sideNav/userStatus.coffee client/views/app/sideNav/userStatus.html client/views/login/form.html client/views/login/services.coffee client/views/main.coffee i18n/de.i18n.json i18n/el.i18n.json i18n/en.i18n.json i18n/es.i18n.json i18n/fi.i18n.json i18n/fr.i18n.json i18n/he.i18n.json i18n/hr.i18n.json i18n/ko.i18n.json i18n/pl.i18n.json i18n/ru.i18n.json i18n/ta-IN.i18n.json i18n/tr.i18n.json i18n/ug.i18n.json lib/fileUpload.coffee packages/rocketchat-lib/settings/server/startup.coffee packages/rocketchat-oembed/client/oembedImageWidget.html public/landing/style.css server/lib/accounts.coffee server/lib/collections.coffee server/methods/createChannel.coffee server/methods/createPrivateGroup.coffee server/methods/deleteMessage.coffee server/methods/eraseRoom.coffee server/methods/saveRoomName.coffee server/methods/sendMessage.coffee server/methods/setUsername.coffee server/restapi/restapi.coffee server/startup/initialData.coffee
|
sorry, wrong repo |
shedoev
added a commit
to sibdigital/rgrt
that referenced
this pull request
May 18, 2020
This was referenced Dec 24, 2020
This was referenced Sep 5, 2021
This was referenced Nov 30, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.