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

Resolve conflicts #169

Merged
merged 7 commits into from
Sep 6, 2024
Merged

Resolve conflicts #169

merged 7 commits into from
Sep 6, 2024

Commits on Jan 15, 2024

  1. 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>
    SamUK93 and Sam Ford committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    b6835b9 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. Configuration menu
    Copy the full SHA
    437aa3d View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

  1. Configuration menu
    Copy the full SHA
    e7fd4f7 View commit details
    Browse the repository at this point in the history
  2. 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>
    SamUK93 and Sam Ford committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    f130a9c View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2024

  1. 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>
    SamUK93 and Sam Ford committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    2e2445c View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2024

  1. resolve conflicts with main branch

    Sonali Tanavade committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    8edc58a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0022add View commit details
    Browse the repository at this point in the history