merge with head from rocketchat by DevBrent · Pull Request #3 · DevBrent/Rocket.Chat

DevBrent · 2016-01-16T16:19:37Z

test

Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>

…36864)

…6871)

Co-authored-by: juliajforesti <juliajforesti@gmail.com>

…1/roles.*` endpoints (#36896)

#36849) Signed-off-by: Abhinav Kumar <abhinav@avitechlab.com>

Co-authored-by: Tasso Evangelista <2263066+tassoevan@users.noreply.github.com>

Co-authored-by: Douglas Fabris <27704687+dougfabris@users.noreply.github.com>

…38366)

…m is encrypted (#38279) Co-authored-by: Douglas Fabris <27704687+dougfabris@users.noreply.github.com>

… payload (#38319)

)

…#37776) Co-authored-by: Kevin Aleman <11577696+KevLehman@users.noreply.github.com>

Co-authored-by: Douglas Fabris <27704687+dougfabris@users.noreply.github.com>

…ndle (#38417) Co-authored-by: Martin Schoeler <20868078+MartinSchoeler@users.noreply.github.com>

…ting (#38389) Co-authored-by: Kevin Aleman <11577696+KevLehman@users.noreply.github.com>

Co-authored-by: Martin Schoeler <20868078+MartinSchoeler@users.noreply.github.com>

gdelavald force-pushed the develop branch from 8206e52 to b618894 Compare June 16, 2017 18:42

rodrigok force-pushed the develop branch from ee29efa to 63677af Compare October 31, 2017 19:37

ggazzo force-pushed the develop branch from 557de78 to 9d7d270 Compare February 4, 2019 22:12

ggazzo force-pushed the develop branch from db0862e to d761ccb Compare January 8, 2020 12:06

ggazzo force-pushed the develop branch from eee09ef to 92219d6 Compare October 23, 2020 23:17

ggazzo force-pushed the develop branch from d04fdd0 to 097d169 Compare November 17, 2020 05:10

ggazzo force-pushed the develop branch from c4cf843 to f65d22c Compare January 8, 2021 19:19

rodrigok force-pushed the develop branch from 7f7525b to f1ce17d Compare November 20, 2021 21:44

sampaiodiego force-pushed the develop branch from 5a953b3 to 3f5c0ad Compare January 4, 2023 21:00

sampaiodiego force-pushed the develop branch from b8cf40a to 25a50bd Compare March 9, 2023 20:45

ggazzo force-pushed the develop branch from 0a928bf to 00cdca7 Compare October 12, 2024 05:46

ggazzo force-pushed the develop branch from 3aa6e6c to ff35b89 Compare November 29, 2024 04:04

MartinSchoeler and others added 18 commits December 20, 2025 15:44

chore!: Remove deprecated insertOrUpdateUser meteor method (#36838)

d804452

chore!: remove deprecated getUserRoles method (#36851)

5664c0c

chore!: Remove deprecated setReaction meteor method (#36837)

5f443d7

chore!: Remove Tokenpass integration (#36620)

aa0ac72

Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>

chore!: Remove deprecated authorization:removeUserFromRole method (#…

1631693

…36864)

chore!: Remove deprecated authorization:deleteRole method

5061423

chore!: Remove deprecated geetRoomRoles method

7826789

chore!: Remove deprecated authorization:addUserToRole method (#36865)

0fe1d48

chore!: Remove deprecated livechat methods & api endpoints (#36836)

61294ee

chore!: Remove livechat:resumeOnHold method (#36908)

b7a3c1b

chore!: Remove Deprecated CreateToken method (#36825)

a1d65f4

chore!: Remove deprecated livechat transfer method and endpoint (#3…

239f4b1

…6871)

chore!: Remove deprecated rooms.upload endpoint (#36857)

dccdcc5

Co-authored-by: juliajforesti <juliajforesti@gmail.com>

chore!: remove the ability to use role names as parameters on `/api/v…

cb3c5e3

…1/roles.*` endpoints (#36896)

chore!: Remove GET method from /api/v1/apps (#36907)

5ac1863

chore!: remove addUserToRole and removeUserFromRole (#36935)

7e3bd97

chore!: remove hideRoomsWithNoActivity param (#36951)

2fb13ce

chore!: remove deprecated appId parameter from oauth-apps.get endpoint (

d7a6204

#36849) Signed-off-by: Abhinav Kumar <abhinav@avitechlab.com>

juliajforesti and others added 30 commits January 26, 2026 15:03

fix: wrong spacing on room header toolbar Options menu (#38318)

5650b78

refactor: replace legacy Menu with GenericMenu (#38287)

aa37226

chore: remove rate limiter for functions (#38354)

c4eff65

feat: new endpoint to delete uploaded files individually (#38173)

e57f158

chore: Add new stats for unsafe api param env usage (#38314)

ca02b57

Co-authored-by: Tasso Evangelista <2263066+tassoevan@users.noreply.github.com>

chore: validateDOMNesting warning in Analytics Reports (#38336)

c6ec7a9

Co-authored-by: Douglas Fabris <27704687+dougfabris@users.noreply.github.com>

chore: unsafe type assertion in CannedResponseForm (#38341)

31d0c01

Co-authored-by: Douglas Fabris <27704687+dougfabris@users.noreply.github.com>

fix: sort parameter validation on /api/v1/audit.settings endpoint (#…

75d089c

…38366)

chore: replace ids with objects as parameters (#38367)

f4d7cc7

refactor: clean up meteor-run-as-user package (#38373)

35ea71a

chore: make twoFactorChecked optional in AuthenticatedContext type

f6cc353

chore: remove Meteor user invocation from rest api (#38017)

464adcb

fix: Don't try to create a non-encrypted discussion if the parent roo…

3a8520f

…m is encrypted (#38279) Co-authored-by: Douglas Fabris <27704687+dougfabris@users.noreply.github.com>

fix: incoming webhooks not unwrapping JSON from x-www-form-urlencoded…

1c47458

… payload (#38319)

fix(e2ee): Subscription's lastMessage not properly decrypting (#38283)

54bd554

refactor(core-typings): Cloud-related schemas (#38219)

972d1c9

chore: adjust plural of statuses (#38368)

9e92b49

chore(apps): refactor jsonrpc request handlers parameter passing (#38322

96c61a8

)

fix: address livechat race condition in agent assignment with locking (…

d3758a7

…#37776) Co-authored-by: Kevin Aleman <11577696+KevLehman@users.noreply.github.com>

fix(integrations): Ensure retryCount is sent as a number #37346 (#37356)

7a10990

refactor: standardize CreateDiscussion modal using GenericModal (#38334)

89b9c8f

Co-authored-by: Douglas Fabris <27704687+dougfabris@users.noreply.github.com>

chore: Add debounce in RoomFiles text search param (#38386)

36ea38f

chore(deps): Patch dependencies (#38349)

2003802

fix: User select inside widget not closing when clicking on widget ha…

a75e1f1

…ndle (#38417) Co-authored-by: Martin Schoeler <20868078+MartinSchoeler@users.noreply.github.com>

fix(model-typings): resolve empty interface violations and fix format…

5cd511f

…ting (#38389) Co-authored-by: Kevin Aleman <11577696+KevLehman@users.noreply.github.com>

refactor: remove uuid package (#37143)

7d89aae

refactor: standardize ForwardChatModal using GenericModal (#38424)

4d67eb7

Co-authored-by: Martin Schoeler <20868078+MartinSchoeler@users.noreply.github.com>

chore: Upgrade fuselage packages (#38418)

7daaf58

fix: support multiple file exports in room message export (#38292)

b0a2011

fix: Sidebar message preview showing "undefined" (#38262)

5b5082f

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

merge with head from rocketchat#3

merge with head from rocketchat#3
DevBrent wants to merge 10000 commits intoDevBrent:developfrom
RocketChat:develop

DevBrent commented Jan 16, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Conversation

DevBrent commented Jan 16, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants