-
Notifications
You must be signed in to change notification settings - Fork 17
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
Resolve conflicts #169
Merged
Merged
Resolve conflicts #169
Commits on Jan 15, 2024
-
DEV-37012: Add docs for error when updating a user with non-existent …
…roles (#150) * docs: Add docs for error when updating a user with non-existent roles * docs: Move 400 response example to the update roles request * docs: Fix grammar * docs: Add separate headers for all responses * docs: Change comments to descriptions and add body tags * Revert "docs: Change comments to descriptions and add body tags" This reverts commit eba9380. --------- Co-authored-by: Sam Ford <sam.ford@acrolinx.com>
Configuration menu - View commit details
-
Copy full SHA for b6835b9 - Browse repository at this point
Copy the full SHA b6835b9View commit details
Commits on Jul 8, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 437aa3d - Browse repository at this point
Copy the full SHA 437aa3dView commit details
Commits on Jul 17, 2024
-
Configuration menu - View commit details
-
Copy full SHA for e7fd4f7 - Browse repository at this point
Copy the full SHA e7fd4f7View commit details -
Remove the comment about invalid tokens resulting in a 401 on the ind…
…ex/root API (#158) Co-authored-by: Sam Ford <sam.ford@acrolinx.com>
Configuration menu - View commit details
-
Copy full SHA for f130a9c - Browse repository at this point
Copy the full SHA f130a9cView commit details
Commits on Aug 2, 2024
-
Add new docs from Acrolinx One GA updates (#159)
* docs: Add staffUser, idpUser and rolesSetByIdp properties to user json * docs: Add 400 response for updating a user's roles when their roles are managed by their IDP * docs: Add idpUser, staffUser and rolesSetByIdp properties to data structures --------- Co-authored-by: Sam Ford <sam.ford@acrolinx.com>
Configuration menu - View commit details
-
Copy full SHA for 2e2445c - Browse repository at this point
Copy the full SHA 2e2445cView commit details
Commits on Sep 6, 2024
-
resolve conflicts with main branch
Sonali Tanavade committedSep 6, 2024 Configuration menu - View commit details
-
Copy full SHA for 8edc58a - Browse repository at this point
Copy the full SHA 8edc58aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0022add - Browse repository at this point
Copy the full SHA 0022addView commit details
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.