Skip to content

Commit

Permalink
Merge branch 'develop' into chore/refresh-oauth-services
Browse files Browse the repository at this point in the history
  • Loading branch information
pierre-lehnen-rc committed Jan 9, 2024
2 parents a6ef7dc + 1b486a1 commit a074ae2
Show file tree
Hide file tree
Showing 126 changed files with 1,770 additions and 1,404 deletions.
5 changes: 5 additions & 0 deletions .changeset/beige-deers-laugh.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fix user being logged out after using 2FA
6 changes: 6 additions & 0 deletions .changeset/big-teachers-change.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": minor
"@rocket.chat/ui-contexts": minor
---

Add the possibility to hide some elements through postMessage events.
5 changes: 5 additions & 0 deletions .changeset/breezy-ladybugs-sip.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixes an issue not allowing admin users to edit rooms
5 changes: 5 additions & 0 deletions .changeset/clean-melons-return.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed image dropping from another browser window creates two upload dialogs in some OS and browsers
5 changes: 5 additions & 0 deletions .changeset/itchy-zoos-appear.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": minor
---

Fixes an issue where avatars are not being disabled based on preference on quote attachments
5 changes: 5 additions & 0 deletions .changeset/nice-points-notice.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fixed an issue when editing a channel's type or name sometimes showing "Room not found" error.
15 changes: 0 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -724,21 +724,6 @@ jobs:
# Makes build fail if the release isn't there
curl --fail https://releases.rocket.chat/$RC_VERSION/info
- name: RedHat Registry
if: github.event_name == 'release'
env:
REDHAT_REGISTRY_PID: ${{ secrets.REDHAT_REGISTRY_PID }}
REDHAT_REGISTRY_KEY: ${{ secrets.REDHAT_REGISTRY_KEY }}
run: |
GIT_TAG="${GITHUB_REF#*tags/}"
curl -X POST \
https://connect.redhat.com/api/v2/projects/$REDHAT_REGISTRY_PID/build \
-H "Authorization: Bearer $REDHAT_REGISTRY_KEY" \
-H 'Cache-Control: no-cache' \
-H 'Content-Type: application/json' \
-d '{"tag":"'$GIT_TAG'"}'
trigger-dependent-workflows:
runs-on: ubuntu-latest
if: github.event_name == 'release'
Expand Down
26 changes: 26 additions & 0 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
tasks:
- init: |
nvm install $(jq -r .engines.node package.json) &&
curl https://install.meteor.com/ | sh &&
export PATH="$PATH:$HOME/.meteor" &&
yarn &&
export ROOT_URL=$(gp url 3000)
command: yarn build && yarn dev
ports:
- port: 3000
visibility: public
onOpen: open-preview

github:
prebuilds:
master: true
pullRequests: true
pullRequestsFromForks: true
addCheck: true
addComment: true
addBadge: true

vscode:
extensions:
- esbenp.prettier-vscode
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,14 @@ yarn dsv # run only meteor (front and back) with pre-built packages

After initialized, you can access the server at http://localhost:3000

# Gitpod Setup

1. Click the button below to open this project in Gitpod.

2. This will open a fully configured workspace in your browser with all the necessary dependencies already installed.

[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/RocketChat/Rocket.Chat)

**Starting Rocket.Chat in microservices mode:**

```bash
Expand Down
44 changes: 0 additions & 44 deletions apps/meteor/.docker/Dockerfile.rhel

This file was deleted.

38 changes: 0 additions & 38 deletions apps/meteor/app/2fa/client/TOTPCrowd.js

This file was deleted.

39 changes: 0 additions & 39 deletions apps/meteor/app/2fa/client/TOTPGoogle.js

This file was deleted.

54 changes: 0 additions & 54 deletions apps/meteor/app/2fa/client/TOTPLDAP.js

This file was deleted.

Loading

0 comments on commit a074ae2

Please sign in to comment.