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

[NEW] Move and Convert channel to Team #21064

Merged
merged 10 commits into from
Mar 23, 2021
Merged

Commits on Mar 9, 2021

  1. add visual component

    dougfabris committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    61bb487 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2021

  1. Merge branch 'new/teams' of github.com:RocketChat/Rocket.Chat into ne…

    …w/channel-to-team
    
    * 'new/teams' of github.com:RocketChat/Rocket.Chat: (174 commits)
      [NEW] teams.leave "rooms" argument (#21262)
      Add teams section and team icon logic
      expose teams fields to local collection
      [FIX] rooms.adminRooms to properly return teams regardless of the other filters (#21257)
      [FIX] subscriptions/get team data (#21254)
      [NEW] teams.addRooms endpoint (#21251)
      Include fname on the results of 'rooms.autocomplete.channelAndPrivate' (#21250)
      Merge teams frontend changes to the backend branch (#21190)
      [NEW] users.listTeams endpoint (#21225)
      Include teams on admin.listRooms (#21224)
      [NEW] Add number of rooms in each team to the teams.list endpoint (#21223)
      [FIX] Wrong license seats number administration info panel (#21222)
      Changed the order of some operations
      Fix lint issues
      [NEW][APPS] Map description as a room value in Apps (#20811)
      Add teamId and teamMain properties to subscriptions/get
      [IMPROVE] Improve Apps permission modal (#21193)
      More lint fixes
      Fixing issues from gh conflicts
      Fix lint issues
      ...
    gabriellsh committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    8549f48 View commit details
    Browse the repository at this point in the history
  2. Team autocomplete endpoint

    gabriellsh committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    c03ab14 View commit details
    Browse the repository at this point in the history
  3. Move to team done

    gabriellsh committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    a5d687f View commit details
    Browse the repository at this point in the history
  4. Lint, codestyle

    gabriellsh committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    a32ab99 View commit details
    Browse the repository at this point in the history
  5. Update service.ts

    MartinSchoeler authored Mar 23, 2021
    Configuration menu
    Copy the full SHA
    4d680c4 View commit details
    Browse the repository at this point in the history
  6. Merge branch 'new/teams' of github.com:RocketChat/Rocket.Chat into ne…

    …w/channel-to-team
    
    * 'new/teams' of github.com:RocketChat/Rocket.Chat: (25 commits)
      hide renderTrackHorizontal on rc-scrollbars
      Review
      Review
      Review
      Review
      Review
      backend integration
      Review
      Add tabbar actions to team room
      fix leave room array
      Add prototype of teams.listRoomsOfUser
      Fix bugs and remove logs
      wip
      Delete & Leave Modals
      WIP
      WIP
      lint
      Separate files, table logic
      add visual components
      WIP DeleteTeamModal
      ...
    gabriellsh committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    59034d1 View commit details
    Browse the repository at this point in the history
  7. ConvertToTeam

    gabriellsh committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    66af5df View commit details
    Browse the repository at this point in the history
  8. Merge branch 'new/teams' of github.com:RocketChat/Rocket.Chat into ne…

    …w/channel-to-team
    
    * 'new/teams' of github.com:RocketChat/Rocket.Chat:
      Fix lint
      fix seeing parent team on teamMain
      [FIX] room autocomplete also listing teams.
      Set teamMain on old room when converting it to a team (#21277)
      [FIX] typescript error (#21276)
      [IMPROVE] teams.members endpoint doesn't support queries (#21273)
      Teams Header (#21214)
      Teams Directory Tab (#21194)
      add checkbox (#21209)
      New/teams (#21269)
      [IMPROVE] teams.list endpoint doesn't support queries (#21259)
      New/teams add teammembers to channels (#21252)
    gabriellsh committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    45c76bf View commit details
    Browse the repository at this point in the history
  9. Lint

    gabriellsh committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    5a9bd73 View commit details
    Browse the repository at this point in the history