Skip to content

[Upstream Catchup] Merge RC:master to develop_pwa #421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ear-dev merged 120 commits into from
Oct 5, 2020
Merged

[Upstream Catchup] Merge RC:master to develop_pwa #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
9efa419
Bump version to 3.7.0-develop
sampaiodiego Aug 31, 2020
65f4cd1
Merge pull request #18752 from RocketChat/develop-sync
sampaiodiego Aug 31, 2020
aa7ad8a
Do not use deprecated express method (#18686)
sampaiodiego Aug 31, 2020
6bfce39
Replace assets copy on postinstall with symlinks (#18707)
tassoevan Sep 1, 2020
93c6749
Update Meteor to 1.11 (#18754)
sampaiodiego Sep 1, 2020
ab70882
LingoHub Update :rocket: (#18761)
engelgabriel Sep 1, 2020
d00c991
Fix french translations (#18746)
lsignac Sep 2, 2020
e30af61
Refactor: Omnichannel Realtime Monitoring (#18666)
gabriellsh Sep 2, 2020
266f5ad
[FIX] Create Custom OAuth services from environment variables (#17377)
mrtndwrd Sep 8, 2020
b469c18
Fix saveRoomSettings method complexity (#18840)
pierre-lehnen-rc Sep 9, 2020
9a934f8
[FIX] e.sendToBottomIfNecessaryDebounced is not a function (#18834)
gabriellsh Sep 9, 2020
0df9b91
Log WebDav upload errors (#18849)
pierre-lehnen-rc Sep 9, 2020
87237f1
[FIX] File upload (Avatars, Emoji, Sounds) (#18841)
ggazzo Sep 9, 2020
68023c0
[FIX] IE11 support livechat widget (#18850)
ggazzo Sep 9, 2020
6b8acd3
[FIX] Can't change password (#18836)
gabriellsh Sep 9, 2020
03fd08d
[FIX] Admin user blank page (#18851)
ggazzo Sep 9, 2020
bb52d5d
[FIX][ENTERPRISE] Omnichannel service status switching to unavailable…
renatobecker Sep 10, 2020
66b872d
[FIX] User can't invite or join other Omnichannel rooms (#18852)
renatobecker Sep 10, 2020
ab9a6d8
[FIX] Omnichannel Current Chats open status filter not working (#18795)
renatobecker Sep 10, 2020
536eaad
[FIX] Jitsi call start updating subscriptions (#18837)
sampaiodiego Sep 11, 2020
bd550af
[FIX] Showing alerts during setup wizard (#18862)
sampaiodiego Sep 11, 2020
c3c78ab
[FIX] Omnichannel Current Chats open status filter not working (#18795)
renatobecker Sep 10, 2020
9caf130
[FIX][ENTERPRISE] Omnichannel service status switching to unavailable…
renatobecker Sep 10, 2020
529a371
[FIX] File upload (Avatars, Emoji, Sounds) (#18841)
ggazzo Sep 9, 2020
0a6930a
[FIX] IE11 support livechat widget (#18850)
ggazzo Sep 9, 2020
15af8d0
[FIX] Admin user blank page (#18851)
ggazzo Sep 9, 2020
679efbb
[FIX] User can't invite or join other Omnichannel rooms (#18852)
renatobecker Sep 10, 2020
b877cbc
[FIX] Showing alerts during setup wizard (#18862)
sampaiodiego Sep 11, 2020
c8c01bd
Bump version to 3.6.1
sampaiodiego Sep 11, 2020
6a4f474
Merge pull request #18867 from RocketChat/release-3.6.1
sampaiodiego Sep 11, 2020
a25dd1a
LingoHub based on develop (#18828)
engelgabriel Sep 14, 2020
c4a6ffd
[FIX] invite-all-from and invite-all-to commands don't work with mult…
Sep 16, 2020
126bcb9
[FIX] If there is `ufs` somewhere in url the request to api always re…
Sep 16, 2020
6df12f8
[FIX] "Save to WebDav" not working (#18883)
pierre-lehnen-rc Sep 16, 2020
093a75e
[FIX] Read receipts showing blank names and not marking messages as r…
wreiske Sep 16, 2020
f026aa7
[FIX] Non-upload requests being passed to UFS proxy middleware (#18931)
Sep 16, 2020
b468f4f
[FIX] Version update check cron job (#18916)
wreiske Sep 17, 2020
45774d4
[FIX] Ignore User action from user card (#18866)
pierre-lehnen-rc Sep 17, 2020
f022259
[FIX] Custom fields required if minLength set and no text typed (#18838)
gabriellsh Sep 17, 2020
5f7472d
[FIX] Dutch: add translations for missing variables (#18814)
Karting06 Sep 17, 2020
982773a
[FIX] French: Add missing __online__ var (#18813)
Karting06 Sep 17, 2020
dc6bcbd
[FIX] Deactivate users that are the last owner of a room using REST A…
Sep 17, 2020
c021c57
[FIX] Show custom fields of invalid type (#18794)
gabriellsh Sep 17, 2020
ecf613e
[FIX] Create Custom OAuth services from environment variables (#17377)
mrtndwrd Sep 8, 2020
43bea4d
[FIX] Read receipts showing blank names and not marking messages as r…
wreiske Sep 16, 2020
878f4c4
[FIX] Version update check cron job (#18916)
wreiske Sep 17, 2020
457b967
[FIX] Ignore User action from user card (#18866)
pierre-lehnen-rc Sep 17, 2020
0147927
[FIX] Deactivate users that are the last owner of a room using REST A…
Sep 17, 2020
48e8e9d
[FIX] Show custom fields of invalid type (#18794)
gabriellsh Sep 17, 2020
e613f2a
Bump version to 3.6.2
sampaiodiego Sep 17, 2020
7301fc4
Merge pull request #18942 from RocketChat/release-3.6.2
sampaiodiego Sep 18, 2020
c9bdb98
[FIX] Stop adding push messages to queue if push is disabled (#18830)
pierre-lehnen-rc Sep 18, 2020
646d9ce
[NEW] "Room avatar changed" system messages (#18839)
pierre-lehnen-rc Sep 18, 2020
a1b159c
[FIX] PDF not rendering (#18956)
gabriellsh Sep 18, 2020
457c5b3
[FIX] Spurious expert role in startup data (#18667)
gillesmeyer Sep 18, 2020
2d7b7da
[FIX] Open room after guest registration (#18755)
ggazzo Sep 18, 2020
af87941
[FIX] Block user action (#18950)
gabriellsh Sep 18, 2020
b3d132f
Refactor: Omnichannel Analytics (#18766)
gabriellsh Sep 18, 2020
38fc10f
[FIX] Deactivated users show as offline (#18767)
gabriellsh Sep 18, 2020
2be1b79
[FIX] Reaction buttons not behaving properly (#18832)
gabriellsh Sep 18, 2020
87dd1dc
Refactor: Message Audit page & Audit logs (#18808)
gabriellsh Sep 18, 2020
cc0e4e6
[FIX] "Download my data" popup showing HTML code. (#18947)
pierre-lehnen-rc Sep 18, 2020
50451b8
[IMPROVE] Move jump to message outside menu (#18928)
MartinSchoeler Sep 18, 2020
ee1001a
[FIX] Users not being able to activate/deactivate E2E in DMs (#18943)
MartinSchoeler Sep 18, 2020
aa6e674
Refactor: Admin permissions page (#18932)
gabriellsh Sep 18, 2020
4f80b12
[IMPROVEMENT] Add "Allow_Save_Media_to_Gallery" setting to mobile (#1…
diegolmello Sep 18, 2020
185603c
Bump lodash.merge from 4.6.1 to 4.6.2 (#18800)
dependabot[bot] Sep 18, 2020
810da2a
[FIX] Errors in LDAP avatar sync preventing login (#18948)
pierre-lehnen-rc Sep 18, 2020
dcf703c
[NEW][Apps] Add support for new livechat guest's and room's events (#…
thassiov Sep 21, 2020
a9ac1cf
[NEW][Apps] Add a Livechat API - setCustomFields (#18912)
Sep 21, 2020
4ff5448
[NEW] UploadFS respects $TMPDIR environment variable (#17012)
d-sko Sep 21, 2020
4b57c0d
[IMPROVE] Stop re-sending push notifications rejected by the gateway …
pierre-lehnen-rc Sep 21, 2020
629aaf7
[FIX] User Info: Email and name/username display (#18976)
gabriellsh Sep 21, 2020
7a51a5e
Update Meteor to 1.11.1 (#18959)
sampaiodiego Sep 21, 2020
287d1dc
[FIX] API call users.setStatus does not trigger status update of clie…
Sep 21, 2020
a86ff5a
LingoHub Update :rocket: (#18973)
lingohub[bot] Sep 21, 2020
b18a5fc
Bump marked from 0.6.3 to 0.7.0 (#18801)
dependabot[bot] Sep 21, 2020
7001c1a
Bump Livechat widget (#18977)
ggazzo Sep 21, 2020
b95fd45
[NEW] Option to require settings on wizard UI via ENV variables (#18974)
rodrigok Sep 21, 2020
4652910
[NEW] Retention policy precision defined by a cron job expression (#1…
ggazzo Sep 21, 2020
fb4fd9e
Set some queries to prefer the secondary database (#18887)
rodrigok Sep 21, 2020
1e608d0
Check i18n file for missing variables (#18762)
sampaiodiego Sep 21, 2020
14a2de5
[FIX] Scrollbar mention ticks always rendering as white (#18979)
gabriellsh Sep 21, 2020
995b4e3
[FIX] Purged threads still show as unread (#18944)
Sep 21, 2020
b77070b
[NEW][Apps] Add a new upload API (#18955)
Sep 22, 2020
43bcd30
[NEW] Send E2E encrypted messages’ content on push notifications (#18…
rodrigok Sep 22, 2020
707aa1f
New: Use database change streams when available (#18892)
rodrigok Sep 22, 2020
097c301
Bump version to 3.7.0-rc.0
sampaiodiego Sep 22, 2020
0c276b5
Regression: Handle MongoDB authentication issues (#18993)
rodrigok Sep 23, 2020
54ca578
[FIX] LDAP avatar upload (#18994)
pierre-lehnen-rc Sep 23, 2020
dfeb656
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Sep 23, 2020
1981ed9
Bump version to 3.7.0-rc.1
sampaiodiego Sep 23, 2020
c3905bd
[FIX] Federation issues (#18978)
alansikora Sep 25, 2020
af4a21a
Obbey to settings properties (#19020)
sampaiodiego Sep 25, 2020
a4fc786
[FIX] PDF not rendering (#18956)
gabriellsh Sep 18, 2020
58a0c20
[FIX] Errors in LDAP avatar sync preventing login (#18948)
pierre-lehnen-rc Sep 18, 2020
fca076a
[FIX] LDAP avatar upload (#18994)
pierre-lehnen-rc Sep 23, 2020
6091df3
[FIX] Federation issues (#18978)
alansikora Sep 25, 2020
cb7c05a
Obbey to settings properties (#19020)
sampaiodiego Sep 25, 2020
9c100ff
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Sep 25, 2020
b8c9815
Bump version to 3.7.0-rc.2
sampaiodiego Sep 25, 2020
8fa9c27
Bump version to 3.6.3
sampaiodiego Sep 25, 2020
a342846
Merge pull request #19022 from RocketChat/release-3.6.3
sampaiodiego Sep 25, 2020
7a7a5e8
Create VIP Sponsors.md
marceloschmidt Sep 25, 2020
2ee3bc4
Regression: Fix login screen reactivity of external login providers (…
rodrigok Sep 28, 2020
77f2b51
[NEW][Apps] Add support to the "encoding" option in http requests fro…
Sep 28, 2020
5f6f002
Regression: File upload via apps not working in some scenarios (#18995)
Sep 29, 2020
9287698
[NEW] Apps-Engine v1.18.0 (#19047)
d-gubert Sep 29, 2020
3c09dda
Regression: Elements select & multiSelect not rendered correctly in t…
Sep 29, 2020
702d43a
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Sep 29, 2020
18938f4
Bump version to 3.7.0-rc.3
sampaiodiego Sep 29, 2020
eb4d04a
Merge branch 'master' into develop
sampaiodiego Sep 29, 2020
bec9d48
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Sep 29, 2020
b40baa3
Bump version to 3.7.0-rc.4
sampaiodiego Sep 29, 2020
9c8c914
Bump version to 3.7.0
sampaiodiego Sep 29, 2020
2c82cd9
Merge pull request #19048 from RocketChat/release-3.7.0
sampaiodiego Sep 29, 2020
4d38ecd
Merge branch 'develop_pwa' into develop_pwa-catchup-2c82cd9
Shailesh351 Oct 5, 2020
a15b99e
Update package-lock.json
Shailesh351 Oct 5, 2020
7f12207
Fix import in Omnichannel Filter
Shailesh351 Oct 5, 2020
47db723
Remove duplicate function
Shailesh351 Oct 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .docker-mongo/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12.16.1-buster-slim
FROM node:12.18.4-buster-slim

LABEL maintainer="buildmaster@rocket.chat"

Expand Down
2 changes: 1 addition & 1 deletion .docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12.16.1-buster-slim
FROM node:12.18.4-buster-slim

LABEL maintainer="buildmaster@rocket.chat"

Expand Down
2 changes: 1 addition & 1 deletion .docker/Dockerfile.rhel
View file
Open in desktop
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.6.3
ENV RC_VERSION 3.7.0

MAINTAINER buildmaster@rocket.chat

Expand Down
Loading