Skip to content

Commit

Permalink
Merge branch 'feat/seats-cap-request-seats' of github.com:RocketChat/…
Browse files Browse the repository at this point in the history
…Rocket.Chat into feat/seats-cap-request-seats

* 'feat/seats-cap-request-seats' of github.com:RocketChat/Rocket.Chat: (59 commits)
  Chore: client endpoints typings (#23152)
  Chore: Update pino and pino-pretty (#23157)
  Bump @rocket.chat/string-helpers in /ee/server/services (#23138)
  [FIX] Inaccurate use of 'Mobile notifications' instead of 'Push notifications' in i18n strings (#22978)
  Bump xml-crypto from 2.1.2 to 2.1.3 (#23141)
  [IMPROVE] Change log format to JSON (#22975)
  Regression: Auth banner for EE (#23091)
  [IMPROVE][APPS] Return task ids when using the scheduler api (#23023)
  [FIX] Update bugsnag package (#23104)
  Bump pm2 from 5.1.0 to 5.1.1 in /ee/server/services (#23128)
  Bump @types/ejson from 2.1.2 to 2.1.3 in /ee/server/services (#23126)
  Chore: Remove non-used dependencies (#23109)
  Bump @types/ws from 7.4.6 to 7.4.7 in /ee/server/services (#23095)
  Bump tar from 6.1.0 to 6.1.11 in /ee/server/services (#23068)
  Bump @types/imap from 0.8.34 to 0.8.35 (#23122)
  Bump csv-parse from 4.16.0 to 4.16.3 (#23120)
  Language update from LingoHub 🤖 (#23123)
  Bump juice from 5.2.0 to 8.0.0 (#22177)
  [FIX] Change way emails are validated on livechat registerGuest method (#23089)
  [IMPROVE] Use PaginatedSelectFiltered in department edition (#23054)
  ...
  • Loading branch information
gabriellsh committed Sep 9, 2021
2 parents e87927c + 970ca8a commit 2a61440
Show file tree
Hide file tree
Showing 429 changed files with 5,396 additions and 3,206 deletions.
2 changes: 1 addition & 1 deletion .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 3.18.0-develop
ENV RC_VERSION 4.0.0-develop

MAINTAINER buildmaster@rocket.chat

Expand Down
Loading

0 comments on commit 2a61440

Please sign in to comment.