Skip to content

Commit

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

* 'develop' of github.com:RocketChat/Rocket.Chat: (42 commits)
  [FIX] Invalid CSS syntax (#17541)
  [NEW] Rewrite admin pages (#17388)
  [FIX] Replace postcss Meteor package (#15929)
  [FIX] Increasing highlight time in 3 seconds (#17540)
  [IMPROVE] Add new webhooks to the Omnichannel integration feature (#17503)
  [BREAK] Remove deprecated Omnichannel Knowledge Base feature (#17387)
  [FIX] Reactions may present empty names of who reacted when using Real Names (#17536)
  Allow to filter omnichannel analytics dashboards per departments. (#17463)
  [FIX] Uncessary updates on Settings, Roles and Permissions on startup (#17160)
  [NEW] Add the ability to send Livechat offline messages to a channel (#17442)
  [FIX] Federation attachment URL for audio and video files (#16430)
  [NEW] Add Livechat website URL to the offline message e-mail (#17429)
  LingoHub based on develop (#17520)
  RegExp improvements suggested by LGTM (#17500)
  [FIX] Replace obsolete X-FRAME-OPTIONS header on Livechat route (#17419)
  [FIX] LDAP login error on Enterprise version (#17497)
  [IMPROVE] [Apps-Engine] App user as the default notifier (#17050)
  [NEW] [Apps-Engine] New Livechat event handlers (#17033)
  [FIX] Change email verification label (#17450)
  Priority system messages were always created (#17479)
  ...
  • Loading branch information
ggazzo committed May 6, 2020
2 parents 432fc7d + 32c558f commit 4fcd8e9
Show file tree
Hide file tree
Showing 516 changed files with 11,409 additions and 9,281 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/rhscl/nodejs-8-rhel7

ENV RC_VERSION 3.2.0-develop
ENV RC_VERSION 3.3.0-develop

MAINTAINER [email protected]

Expand Down
3 changes: 1 addition & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@
"@typescript-eslint/interface-name-prefix": [
"error",
"always"
],
"@typescript-eslint/explicit-function-return-type": "off"
]
},
"env": {
"browser": true,
Expand Down
Loading

0 comments on commit 4fcd8e9

Please sign in to comment.