-
Notifications
You must be signed in to change notification settings - Fork 4
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
[v0.93.0] Roles API, Unauthenticated Explore page (Merge conflict fix) #4609
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
Allow roleSet invitation to an extra Role
made lookup by nameID to be separate to lookup by UUID
Fix nameId resolution of template
…to delete users later; made field protected
AuthenticationType enum added and resolver added to User
Fixed migrations on clean / prod db schema
version bump
Conflicts dev & master
Comoque1
approved these changes
Oct 11, 2024
hero101
changed the title
Merge conflict fix (master <- develop)
[v0.93.0] Roles API, Unauthenticated Explore page (Merge conflict fix)
Oct 11, 2024
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.
What's Changed
Full Changelog: v0.92.3...v0.93.0
conflict
frommaster
develop
->conflict
conflict
->master