Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into moji
Browse files Browse the repository at this point in the history
* 'develop' of github.com:RocketChat/Rocket.Chat: (151 commits)
  [FIX] User's with non-agent role shown on voip agent association model (#25682)
  Fix CI
  fix CI
  Chore: Convert CreateChannelWithData (#25667)
  Chore: Convert UserAutoCompleteMultiple (#25587)
  Chore: Converting files from app/livechat folder from JS to TS (#25658)
  Chore: Convert sidebar/header/actions (#25581)
  Chore: Converting omnichannel installation files to ts (#25665)
  Chore: Convert to TS omnichannel/agent (#25511)
  Chore: Convert components/sidebar to TS (#25429)
  Chore: Convert apps/meteor/client/sidebar/header/index (#25671)
  Chore: Migrate some small helper functions to TypeScript (#25666)
  Merge master into develop & Set version to 5.0.0 (#25702)
  Chore: Update Apps-Engine and Fuselage (#25700)
  Regression: App event listeners broke Slackbridge integration and importers (#25689)
  [FIX] Fix max-width message block (#25686)
  [FIX] Change form body parameter charset to UTF-8 to fix issue #25456 (#25673)
  Regression: Fix sort field files.list (#25687)
  fix git conflict (#25684)
  [FIX] Prevent federation crash on invite users as a non-owner user (#25683)
  ...
  • Loading branch information
gabriellsh committed Jun 1, 2022
2 parents 7a14c5d + db257d3 commit 91b6352
Show file tree
Hide file tree
Showing 2,023 changed files with 89,867 additions and 19,622 deletions.
4 changes: 4 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
/packages/* @RocketChat/chat-engine
/packages/core-typings/ @RocketChat/chat-engine
/packages/rest-typings/ @RocketChat/chat-engine
/packages/ui-contexts/ @RocketChat/frontend
/packages/eslint-config/ @RocketChat/chat-engine
/packages/livechat/ @RocketChat/frontend @RocketChat/chat-engine
/.vscode/ @RocketChat/chat-engine
/.github/ @RocketChat/chat-engine
/_templates/ @RocketChat/chat-engine
/apps/meteor/client/ @RocketChat/frontend
/apps/meteor/tests/ @RocketChat/chat-engine
42 changes: 42 additions & 0 deletions .github/history-manual.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,20 @@
"pierre-lehnen-rc"
]
}],
"3.18.6": [{
"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
"userLogin": "d-gubert",
"contributors": [
"ggazzo"
]
}],
"3.18.7": [{
"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
"userLogin": "d-gubert",
"contributors": [
"ggazzo"
]
}],
"4.1.1": [{
"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
"userLogin": "sampaiodiego",
Expand All @@ -147,5 +161,33 @@
"contributors": [
"gronke"
]
}],
"4.4.4": [{
"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
"userLogin": "d-gubert",
"contributors": [
"ggazzo"
]
}],
"4.4.5": [{
"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
"userLogin": "d-gubert",
"contributors": [
"ggazzo"
]
}],
"4.7.3": [{
"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
"userLogin": "d-gubert",
"contributors": [
"ggazzo"
]
}],
"4.7.4": [{
"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
"userLogin": "d-gubert",
"contributors": [
"ggazzo"
]
}]
}
Loading

0 comments on commit 91b6352

Please sign in to comment.