Skip to content

Commit

Permalink
Merge remote-tracking branch 'rocketchat/master'
Browse files Browse the repository at this point in the history
* rocketchat/master: (133 commits)
  Bump version to 3.11.0
  Bump version to 3.11.0-rc.7
  Bump version to 3.11.0-rc.6
  Regression: Set image sizes based on rotation (RocketChat#20531)
  Regression: Apps-Engine - Convert streams to buffers on file upload (RocketChat#20523)
  Regression: Room not scrolling to bottom (RocketChat#20516)
  Regression: NPS (RocketChat#20514)
  Regression: Fix e2e paused state (RocketChat#20511)
  Regression: Custom field labels are not displayed properly on Omnichannel Contact Profile form (RocketChat#20393)
  Bump version to 3.11.0-rc.5
  Regression: Fix banners sync data types (RocketChat#20517)
  Regression: Fixed update room avatar issue.  (RocketChat#20433)
  Regression: ESLint Warning - explicit-function-return-type (RocketChat#20434)
  Bump version to 3.11.0-rc.4
  [FIX][Apps] Don't show the "review permissions" modal when there's none to review (RocketChat#20506)
  Revert "[NEW][ENTERPRISE] Hide message history for new channel members (RocketChat#20253)" (RocketChat#20461)
  Update Apps-Engine and permissions translations (RocketChat#20491)
  Regression: Add tests to new banners REST endpoints (RocketChat#20492)
  [IMPROVE] Autofocus on directory (RocketChat#20509)
  Update "Industry" setting (RocketChat#20510)
  ...
  • Loading branch information
Dinh Van Hoang committed Feb 5, 2021
2 parents fa01ba4 + 62aa68d commit 99a6ed6
Show file tree
Hide file tree
Showing 478 changed files with 21,293 additions and 11,881 deletions.
518 changes: 0 additions & 518 deletions .circleci/config.yml.old

This file was deleted.

8 changes: 0 additions & 8 deletions .circleci/namefiles.sh

This file was deleted.

12 changes: 0 additions & 12 deletions .circleci/redhat-registry.sh

This file was deleted.

23 changes: 0 additions & 23 deletions .circleci/setartname.sh

This file was deleted.

2 changes: 0 additions & 2 deletions .circleci/setdeploydir.sh

This file was deleted.

8 changes: 0 additions & 8 deletions .circleci/setupsig.sh

This file was deleted.

40 changes: 0 additions & 40 deletions .circleci/snap.sh

This file was deleted.

10 changes: 0 additions & 10 deletions .circleci/update-releases.sh

This file was deleted.

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.10.5
ENV RC_VERSION 3.11.0

MAINTAINER buildmaster@rocket.chat

Expand Down
13 changes: 9 additions & 4 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@
"indent": "off",
"no-extra-parens": "off",
"no-spaced-func": "off",
"no-unused-vars": "off",
"no-useless-constructor": "off",
"no-use-before-define": "off",
"react/jsx-uses-react": "error",
"react/jsx-uses-vars": "error",
"react/jsx-no-undef": "error",
Expand All @@ -99,6 +101,10 @@
"SwitchCase": 1
}
],
"@typescript-eslint/interface-name-prefix": [
"error",
"always"
],
"@typescript-eslint/no-extra-parens": [
"error",
"all",
Expand All @@ -111,10 +117,9 @@
}
],
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/interface-name-prefix": [
"error",
"always"
]
"@typescript-eslint/no-unused-vars": ["error", {
"argsIgnorePattern": "^_"
}]
},
"env": {
"browser": true,
Expand Down

0 comments on commit 99a6ed6

Please sign in to comment.