Skip to content

Commit

Permalink
Merge branch 'develop' into test/team/management
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Sep 15, 2023
2 parents 1853841 + 3677cc5 commit fa003f0
Show file tree
Hide file tree
Showing 135 changed files with 2,905 additions and 903 deletions.
5 changes: 5 additions & 0 deletions .changeset/bump-patch-1694741499930.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Bump @rocket.chat/meteor version.
5 changes: 5 additions & 0 deletions .changeset/honest-mirrors-sit.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Disabled call to tags enterprise endpoint when on community license
5 changes: 0 additions & 5 deletions .changeset/loud-bees-smoke.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/nine-bottles-press.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

feat: Add flag to disable teams mention via troubleshoot page
163 changes: 163 additions & 0 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,163 @@
{
"mode": "pre",
"tag": "rc",
"initialVersions": {
"@rocket.chat/meteor": "6.4.0-develop",
"rocketchat-services": "1.1.4",
"@rocket.chat/account-service": "0.2.4",
"@rocket.chat/authorization-service": "0.2.4",
"@rocket.chat/ddp-streamer": "0.1.4",
"@rocket.chat/omnichannel-transcript": "0.2.4",
"@rocket.chat/presence-service": "0.2.4",
"@rocket.chat/queue-worker": "0.2.4",
"@rocket.chat/stream-hub-service": "0.2.4",
"@rocket.chat/api-client": "0.1.4",
"@rocket.chat/ddp-client": "0.1.4",
"@rocket.chat/omnichannel-services": "0.0.10",
"@rocket.chat/pdf-worker": "0.0.10",
"@rocket.chat/presence": "0.0.10",
"@rocket.chat/ui-theming": "0.0.1",
"@rocket.chat/account-utils": "0.0.1",
"@rocket.chat/agenda": "0.0.2",
"@rocket.chat/base64": "1.0.12",
"@rocket.chat/cas-validate": "0.0.1",
"@rocket.chat/core-services": "0.1.4",
"@rocket.chat/core-typings": "6.3.4",
"@rocket.chat/cron": "0.0.6",
"@rocket.chat/eslint-config": "0.5.2",
"@rocket.chat/favicon": "0.0.1",
"@rocket.chat/fuselage-ui-kit": "1.0.4",
"@rocket.chat/gazzodown": "1.0.4",
"@rocket.chat/i18n": "0.0.1",
"@rocket.chat/instance-status": "0.0.10",
"@rocket.chat/livechat": "1.13.4",
"@rocket.chat/log-format": "0.0.1",
"@rocket.chat/logger": "0.0.1",
"@rocket.chat/mock-providers": "0.0.1",
"@rocket.chat/model-typings": "0.0.10",
"@rocket.chat/models": "0.0.10",
"@rocket.chat/poplib": "0.0.1",
"@rocket.chat/random": "1.2.1",
"@rocket.chat/release-action": "2.1.0",
"@rocket.chat/rest-typings": "6.3.4",
"@rocket.chat/server-fetch": "0.0.1",
"@rocket.chat/sha256": "1.0.9",
"@rocket.chat/tools": "0.0.1",
"@rocket.chat/ui-client": "1.0.4",
"@rocket.chat/ui-composer": "0.0.1",
"@rocket.chat/ui-contexts": "1.0.4",
"@rocket.chat/ui-video-conf": "1.0.4",
"@rocket.chat/uikit-playground": "0.1.4",
"@rocket.chat/web-ui-registration": "1.0.4"
},
"changesets": [
"blue-ladybugs-raise",
"breezy-bugs-jam",
"bright-carpets-fly",
"bright-snakes-vanish",
"brown-clouds-add",
"bump-patch-1694741499930",
"chilled-flies-fold",
"chilled-phones-give",
"cool-students-tan",
"cuddly-houses-tie",
"cuddly-ties-bake",
"curly-shoes-burn",
"custom-emoji-fs",
"dropdown",
"eighty-kids-jog",
"eleven-icons-tan",
"empty-ants-enjoy",
"fair-cats-destroy",
"fast-pumpkins-smoke",
"fast-yaks-collect",
"fifty-cars-divide",
"fluffy-beds-buy",
"fluffy-lions-rage",
"forty-hotels-pretend",
"four-parents-cheer",
"friendly-glasses-mate",
"fuzzy-glasses-divide",
"fuzzy-schools-brake",
"gold-horses-pretend",
"gold-moose-press",
"good-elephants-live",
"green-adults-peel",
"grumpy-candles-rule",
"heavy-baboons-laugh",
"heavy-cougars-marry",
"hip-hounds-ring",
"hip-mugs-promise",
"honest-glasses-roll",
"honest-mirrors-sit",
"honest-numbers-compete",
"importer-progress-bar",
"kind-students-worry",
"lazy-ghosts-design",
"loud-sheep-try",
"lovely-snails-drop",
"lucky-balloons-divide",
"lucky-hounds-sing",
"many-icons-provide",
"mighty-walls-smash",
"moody-comics-cheat",
"moody-pans-act",
"nine-bottles-press",
"nine-carrots-listen",
"odd-elephants-promise",
"old-federation-card",
"perfect-adults-travel",
"pink-zoos-join",
"pretty-bees-give",
"quick-emus-march",
"quiet-phones-sell",
"rare-sheep-yawn",
"real-pets-visit",
"red-windows-admire",
"red-zebras-clap",
"rotten-turtles-agree",
"serious-garlics-clean",
"serious-geckos-drive",
"serious-shrimps-try",
"seven-jobs-tickle",
"shaggy-beans-poke",
"shiny-garlics-carry",
"shiny-tools-worry",
"short-cobras-tell",
"silly-actors-laugh",
"silver-mugs-unite",
"six-buckets-eat",
"slimy-cheetahs-heal",
"slimy-wasps-double",
"slow-lizards-breathe",
"small-rice-repair",
"smooth-planes-cough",
"soft-yaks-matter",
"sour-cows-refuse",
"sour-parrots-nail",
"stale-roses-knock",
"strong-laws-pump",
"swift-birds-build",
"swift-walls-protect",
"tame-pens-occur",
"three-birds-tickle",
"tidy-bears-camp",
"tiny-turkeys-burn",
"tough-candles-heal",
"tricky-years-swim",
"unlucky-turtles-search",
"user-mention",
"violet-frogs-cheer",
"warm-hornets-ring",
"wet-frogs-kiss",
"wet-walls-lie",
"wild-spiders-smell",
"wise-onions-trade",
"wise-walls-tan",
"wise-ways-fetch",
"witty-feet-warn",
"yellow-buttons-agree",
"yellow-schools-tell",
"young-trains-glow"
]
}
5 changes: 5 additions & 0 deletions .changeset/slimy-cheetahs-heal.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixed selected departments not being displayed due to pagination
5 changes: 5 additions & 0 deletions .changeset/young-trains-glow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': minor
---

Fixed the issue of apps icon uneven alignment in case of missing icons inside message composer toolbar & message toolbar menu.
2 changes: 1 addition & 1 deletion apps/meteor/.docker/Dockerfile.rhel
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM registry.access.redhat.com/ubi8/nodejs-12

ENV RC_VERSION 6.4.0-develop
ENV RC_VERSION 6.5.0-develop

MAINTAINER [email protected]

Expand Down
Loading

0 comments on commit fa003f0

Please sign in to comment.