Skip to content

Conversation

@pierre-lehnen-rc
Copy link
Contributor

Proposed changes (including videos or screenshots)

Issue(s)

Steps to test or reproduce

Further comments

@pierre-lehnen-rc pierre-lehnen-rc merged commit 93be4fe into new/teams-back Mar 21, 2021
@pierre-lehnen-rc pierre-lehnen-rc deleted the new/teams-back-users-listTeams branch March 21, 2021 01:24
gabriellsh added a commit that referenced this pull request Mar 22, 2021
…ams/info

* 'new/teams' of github.com:RocketChat/Rocket.Chat:
  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
  Add teamId and teamMain properties to subscriptions/get
  More lint fixes
  Fixing issues from gh conflicts
  Fix lint issues
  Allow users to add private channels to teams
  Reduced duplicated code between community and enterprise Spotlight code
  Fix e2e test
  Fix lint issues part 2
  Fix lint issues
  Spotlight show teams as clickable users
gabriellsh added a commit that referenced this pull request Mar 23, 2021
…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
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants