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.

Sign up for GitHub

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

Jump to bottom

Merge Backend #21143

Merged
merged 26 commits into from
Mar 16, 2021
Merged

Merge Backend #21143

merged 26 commits into from
Mar 16, 2021

Commits on Mar 12, 2021

  1. Add property to identify main team room 

    Create membership for users when they join main team channel

Propagate ownership modifications to the teammember instance
    @KevLehman
    KevLehman committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    b5f8e93 View commit details
    Browse the repository at this point in the history

  2. Add missing types

    @KevLehman
    KevLehman committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    1875719 View commit details
    Browse the repository at this point in the history

  3. Add Team Members' endpoints

    @matheusbsilva137
    matheusbsilva137 authored and matheusbsilva137 committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    a63eb72 View commit details
    Browse the repository at this point in the history

  4. Change members method's return type

    @matheusbsilva137
    matheusbsilva137 committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    5abc8ee View commit details
    Browse the repository at this point in the history

  5. Add ITeamMember import

    @matheusbsilva137
    matheusbsilva137 committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    281b2c6 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2021

  1. Add tests to the new endpoints

    @matheusbsilva137
    matheusbsilva137 committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    bee07e0 View commit details
    Browse the repository at this point in the history

  2. Move permission checks to endpoints

    @matheusbsilva137
    matheusbsilva137 committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    a64e661 View commit details
    Browse the repository at this point in the history

  3. Fix services parameters

    @matheusbsilva137
    matheusbsilva137 committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    77ca408 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2021

  1. Fix PR comments

    @KevLehman
    KevLehman committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    e00904e View commit details
    Browse the repository at this point in the history

  2. Return team member element on addMember call

    @KevLehman
    KevLehman committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    4b8ffa5 View commit details
    Browse the repository at this point in the history

  3. Reflect role changes on other room role changes

    @KevLehman
    KevLehman committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    bb8585e View commit details
    Browse the repository at this point in the history

  4. Merge branch 'new/teams-back' into new/teams-mainroom

    @pierre-lehnen-rc
    pierre-lehnen-rc committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    f6d1e81 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'new/teams-mainroom' of github.com:RocketChat/Rocket.Cha… 

    …t into new/teams-mainroom
    @pierre-lehnen-rc
    pierre-lehnen-rc committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    811f2c7 View commit details
    Browse the repository at this point in the history

  6. Fix queries' formats and add members' verifications to tests

    @matheusbsilva137
    matheusbsilva137 committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    ecdd312 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #21097 from RocketChat/new/teams-mainroom 

    [New][Teams] Change places that control channel membership to reflect on team membership
    @pierre-lehnen-rc
    pierre-lehnen-rc authored Mar 15, 2021
    Configuration menu
    Copy the full SHA
    ec4869d View commit details
    Browse the repository at this point in the history

  8. Merge branch 'new/teams-back' into new/teams-back-add-members

    @matheusbsilva137
    matheusbsilva137 authored Mar 15, 2021
    Configuration menu
    Copy the full SHA
    5ad8ed1 View commit details
    Browse the repository at this point in the history

  9. Remove unused imports

    @matheusbsilva137
    matheusbsilva137 committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    893f973 View commit details
    Browse the repository at this point in the history

  10. Add missing import

    @matheusbsilva137
    matheusbsilva137 committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    7c418fa View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2021

  1. Fix verifications in tests

    @matheusbsilva137
    matheusbsilva137 committed Mar 16, 2021
    Configuration menu
    Copy the full SHA
    bbc717a View commit details
    Browse the repository at this point in the history

  2. Fix tests and remove unused variables

    @matheusbsilva137
    matheusbsilva137 committed Mar 16, 2021
    Configuration menu
    Copy the full SHA
    b84c358 View commit details
    Browse the repository at this point in the history

  3. Update app/api/server/v1/teams.ts

    @pierre-lehnen-rc
    pierre-lehnen-rc authored Mar 16, 2021
    Configuration menu
    Copy the full SHA
    545a39d View commit details
    Browse the repository at this point in the history

  4. Update app/api/server/v1/teams.ts

    @pierre-lehnen-rc
    pierre-lehnen-rc authored Mar 16, 2021
    Configuration menu
    Copy the full SHA
    51853eb View commit details
    Browse the repository at this point in the history

  5. Update app/api/server/v1/teams.ts

    @pierre-lehnen-rc
    pierre-lehnen-rc authored Mar 16, 2021
    Configuration menu
    Copy the full SHA
    44657ed View commit details
    Browse the repository at this point in the history

  6. Update app/api/server/v1/teams.ts

    @pierre-lehnen-rc
    pierre-lehnen-rc authored Mar 16, 2021
    Configuration menu
    Copy the full SHA
    3a30713 View commit details
    Browse the repository at this point in the history

  7. Removed blank line

    @pierre-lehnen-rc
    pierre-lehnen-rc committed Mar 16, 2021
    Configuration menu
    Copy the full SHA
    b89d0f4 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #21099 from RocketChat/new/teams-back-add-members 

    [NEW] Add Team Members' endpoints
    @pierre-lehnen-rc
    pierre-lehnen-rc authored Mar 16, 2021
    Configuration menu
    Copy the full SHA
    806c3f0 View commit details
    Browse the repository at this point in the history