Downstream stable9 16-06-10 #37
Merged
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
getUserGroups: Using $userDN instead of $uid to query LDAP Converting groupDN to group name using API instead of substring Removing cache processing at the end of the method
added back the cache processing and fixed
spaces -> tab conversion
[stable9] skip scanning for a user when the user is not setup yet
[stable9] Use temporary htaccesstest.txt for data dir security check
[stable9] Delay reloading the page if an ajax error occurs, show notification
[Stable9] Construct path to the version file from the current directory and fil…
…cess [stable9] Fixed dynamic group ldap access
…tream-stable9-160610
|
Went through the changes. They look fine and at least the updater fixes we ought to have as well => merge. |
|
The LDAP changes appear fine as well. Thx @LukasReschke |
8 tasks
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.
That's currently the difference between our stable9 branch and upstreams'.
How to proceed here? Merge them like this, or do fain-grained handpicking? What are your opinions?
@karlitschek @LukasReschke @MorrisJobke @Mar1u5