Skip to content
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.

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

Chore: Merging develop to new/livechat-voip #23891

Merged
merged 160 commits into from
Dec 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
160 commits
Select commit Hold shift + click to select a range
05657a3
[FIX] LDAP not stoping after wrong password (#23382)
rodrigok Oct 6, 2021
9e3ba7c
[FIX] MongoDB deprecation link (#23381)
sampaiodiego Oct 6, 2021
132814a
[FIX] resumeToken not working (#23379)
sampaiodiego Oct 5, 2021
24ab7bb
[FIX] Unwanted toastr error message when deleting user (#23372)
ostjen Oct 5, 2021
9664fde
[FIX] BigBlueButton integration error due to missing file import (#23…
wolbernd Oct 5, 2021
092a6e7
Chore: Update Apps-Engine version (#23375)
d-gubert Oct 5, 2021
e76cbb6
imported migration v240 (#23374)
ostjen Oct 5, 2021
f79a2a3
[FIX] Users' `roles` and `type` being reset to default on LDAP DataSy…
matheusbsilva137 Oct 6, 2021
2716d4a
Bump version to 4.0.1
sampaiodiego Oct 6, 2021
accdbc6
Merge pull request #23386 from RocketChat/release-4.0.1
sampaiodiego Oct 6, 2021
f023a52
Prevent starting Omni-Queue if Omnichannel is disabled (#23396)
murtaza98 Oct 14, 2021
914daa9
[FIX][ENTERPRISE] Omnichannel agent is not leaving the room when a fo…
murtaza98 Oct 12, 2021
6dba71c
[FIX] user/agent upload not working via Apps Engine after 3.16.0 (#23…
murtaza98 Oct 8, 2021
6e56144
[FIX] Attachment buttons overlap in mobile view (#23377)
Aman-Maheshwari Oct 6, 2021
32d1f4e
Bump version to 4.0.2
sampaiodiego Oct 14, 2021
2d22f62
Merge pull request #23460 from RocketChat/release-4.0.2
sampaiodiego Oct 14, 2021
536ba33
[FIX] Server crashing when Routing method is not available at start (…
KevLehman Oct 18, 2021
9631bd1
[FIX][APPS] Communication problem when updating and uninstalling apps…
thassiov Oct 18, 2021
1249183
Bump version to 4.0.3
sampaiodiego Oct 18, 2021
6e49fc9
Merge pull request #23496 from RocketChat/release-4.0.3
sampaiodiego Oct 18, 2021
adf0d37
Bump version to 4.1.0-rc.0
sampaiodiego Oct 21, 2021
41d4bdd
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Oct 21, 2021
317a04b
Bump version to 4.1.0-rc.1
sampaiodiego Oct 21, 2021
ed96030
[FIX] Queue error handling and unlocking behavior (#23522)
KevLehman Oct 20, 2021
761b874
[FIX] SAML Users' roles being reset to default on login (#23411)
matheusbsilva137 Oct 21, 2021
f223443
Bump version to 4.0.4
sampaiodiego Oct 21, 2021
17db619
Merge pull request #23532 from RocketChat/release-4.0.4
sampaiodiego Oct 21, 2021
4c1cade
[FIX] OAuth login not working on mobile app (#23541)
pierre-lehnen-rc Oct 25, 2021
8555634
[FIX] OAuth login not working on mobile app (#23541)
pierre-lehnen-rc Oct 25, 2021
f1cf805
Bump version to 4.0.5
sampaiodiego Oct 25, 2021
803e9cf
Merge pull request #23554 from RocketChat/release-4.0.5
sampaiodiego Oct 25, 2021
0d04049
Regression: Mail body contains `undefined` text (#23552)
tassoevan Oct 25, 2021
e045c5c
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Oct 25, 2021
d972826
Bump version to 4.1.0-rc.2
sampaiodiego Oct 25, 2021
ccbe062
Start scheduler after apps have been loaded (#23539)
d-gubert Oct 26, 2021
32d78f6
Revert "Start scheduler after apps have been loaded (#23539)" (#23564)
d-gubert Oct 26, 2021
d21b9cf
Bump: fuselage 0.30.1 (#23391)
ggazzo Oct 27, 2021
06579aa
Regression: Routing method not available when called from listeners a…
KevLehman Oct 27, 2021
90531dd
Regression: Prevent settings from getting updated (#23556)
sampaiodiego Oct 27, 2021
225e043
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Oct 27, 2021
2881a4d
Bump version to 4.1.0-rc.3
sampaiodiego Oct 27, 2021
6b6fdde
Regression: Debounce call based on params on omnichannel queue dispat…
KevLehman Oct 28, 2021
d445ca7
Merge branch 'master' into develop
sampaiodiego Oct 28, 2021
d304143
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Oct 28, 2021
b4de1cf
Bump version to 4.1.0-rc.4
sampaiodiego Oct 28, 2021
1cd901e
Bump version to 4.1.0
sampaiodiego Oct 28, 2021
0da143c
Merge pull request #23581 from RocketChat/release-4.1.0
sampaiodiego Oct 28, 2021
4c37c5c
Bump version to 4.2.0-develop
sampaiodiego Oct 28, 2021
5504804
Merge pull request #23586 from RocketChat/develop-sync
sampaiodiego Oct 28, 2021
ac84a41
[IMPROVE] MKP12 - New UI - Merge Apps and Marketplace Tabs and Conten…
rique223 Oct 29, 2021
c954c5f
[FIX] Notifications are not being filtered (#23487)
matheusbsilva137 Oct 29, 2021
cbd2a0b
Chore: Rearrange module typings (#23452)
tassoevan Nov 1, 2021
9c42d40
[NEW] Show on-hold metrics on analytics pages and current chats (#23498)
KevLehman Nov 1, 2021
7af515f
i18n: Language update from LingoHub 🤖 on 2021-11-01Z (#23603)
lingohub[bot] Nov 1, 2021
b092bef
Start scheduler after apps have been loaded (#23566)
d-gubert Nov 1, 2021
6deb095
[FIX] App update flow failing in HA setups (#23607)
d-gubert Nov 3, 2021
fce342c
[FIX] Cannot deactive a regular user if there's only one admin
dudanogueira Nov 4, 2021
6146806
[FIX] "to users" not working in export message (#23576)
ostjen Nov 4, 2021
9726f44
[FIX] LDAP users not being re-activated on login (#23627)
pierre-lehnen-rc Nov 5, 2021
21f69ac
[FIX] Advanced LDAP Sync Features (#23608)
pierre-lehnen-rc Nov 5, 2021
78fa896
[FIX] Advanced LDAP Sync Features (#23608)
pierre-lehnen-rc Nov 5, 2021
65cb240
[FIX] LDAP users not being re-activated on login (#23627)
pierre-lehnen-rc Nov 5, 2021
6dbd6aa
[FIX] Cannot deactive a regular user if there's only one admin
dudanogueira Nov 4, 2021
1131e00
[FIX] App update flow failing in HA setups (#23607)
d-gubert Nov 3, 2021
672fe95
Bump version to 4.1.1
sampaiodiego Nov 5, 2021
977b175
Merge pull request #23645 from RocketChat/release-4.1.1
sampaiodiego Nov 6, 2021
2be0a6d
Merge branch 'master' into develop
sampaiodiego Nov 6, 2021
2291b80
[FIX] Performance issues when running Omnichannel job queue dispatche…
renatobecker Nov 8, 2021
55fafd0
[FIX] Omnichannel status being changed on page refresh (#23587)
KevLehman Nov 8, 2021
85619ea
[FIX] Omnichannel status being changed on page refresh (#23587)
KevLehman Nov 8, 2021
a6d40c6
[FIX] Performance issues when running Omnichannel job queue dispatche…
renatobecker Nov 8, 2021
842a016
[FIX] Notifications are not being filtered (#23487)
matheusbsilva137 Oct 29, 2021
ba69fee
Bump version to 4.1.2
ggazzo Nov 9, 2021
2aba8d2
Merge pull request #23671 from RocketChat/release-4.1.2
ggazzo Nov 9, 2021
0eba268
[NEW] Permissions for interacting with Omnichannel Contact Center (#2…
cauefcr Nov 9, 2021
283d957
Merge branch 'master' into develop
ggazzo Nov 10, 2021
f50609d
Chore: Convert Fiber models to async Step 1 (#23633)
rodrigok Nov 10, 2021
8650aa7
[IMPROVE] Reduce complexity in some functions (#23387)
tassoevan Nov 10, 2021
f83a422
Chore: Remove useCallbacks (#23696)
tassoevan Nov 12, 2021
8875f50
Regression: Improve AggregationCursor types (#23692)
ggazzo Nov 12, 2021
f5dd145
fix (#23691)
tiagoevanp Nov 12, 2021
e150668
[IMPROVE] Allow override of default department for SMS Livechat sessi…
bhardwajaditya Nov 12, 2021
687e17a
[FIX] Omnichannel business hours page breaking navigation (#23595)
Aman-Maheshwari Nov 12, 2021
96426cd
fix omnichannel webhooks can't be saved (#23641)
Aman-Maheshwari Nov 12, 2021
91c5ddc
[FIX] Horizontal rule render for inline marked options #23380
dougfabris Nov 12, 2021
f05d893
Replace all occurrences of a placeholder on string instead of just fi…
KevLehman Nov 15, 2021
a858dbc
Chore: Api definitions (#23701)
ggazzo Nov 15, 2021
8931a6a
Chore: Mocha testing configuration (#23706)
tassoevan Nov 16, 2021
791ef5d
[FIX] Fix typo in FR translation (#23711)
Cormoran96 Nov 16, 2021
c320e37
Chore: add `no-bidi` rule (#23695)
KevLehman Nov 16, 2021
7ed6846
[FIX] PhotoSwipe crashing on show (#23499)
tassoevan Nov 16, 2021
d232e81
[FIX] Prevent UserAction.addStream without Subscription (#23705)
tiagoevanp Nov 16, 2021
eb0f205
[FIX] broken avatar preview when changing avatar (#23659)
Aman-Maheshwari Nov 16, 2021
7660464
[FIX] Fixed E2E default room settings not being honoured (#23468)
ostjen Nov 16, 2021
485676a
Improve naming for twilio department param (#23725)
murtaza98 Nov 17, 2021
56b6d33
[NEW] Allow Omnichannel statistics to be collected. (#23694)
cauefcr Nov 17, 2021
6ede939
[FIX] Discussions created inside discussions (#23733)
ggazzo Nov 17, 2021
7bcaaac
[FIX] Missing user roles in edit user tab (#23734)
dougfabris Nov 17, 2021
c54ef38
[FIX][ENTERPRISE] Private rooms and discussions can't be audited (#23…
matheusbsilva137 Nov 17, 2021
bc91e46
Await promise to handle error when attempting to transfer a room (#23…
KevLehman Nov 18, 2021
c2b198c
[FIX] User logout after reset E2E key #21314
siva2204 Nov 18, 2021
cea0e40
Chore: Generic Table (#23745)
ggazzo Nov 18, 2021
d9ccd56
[FIX] Autofocus on search input in admin (#23738)
gabriellsh Nov 18, 2021
733af42
[NEW] REST endpoints to manage Omnichannel Business Units (#23750)
KevLehman Nov 19, 2021
9a3c2cf
Regression: Units endpoint to TS (#23757)
ggazzo Nov 19, 2021
c83c0be
[IMPROVE] Stricter API types (#23735)
tassoevan Nov 19, 2021
e0fa701
[NEW] Permission for download/uploading files on mobile (#23686)
ostjen Nov 19, 2021
f1ce17d
allow registering by REG_TOKEN environment variable (#23737)
geekgonecrazy Nov 20, 2021
9771ee6
Chore: Type omnichannel models (#23758)
KevLehman Nov 22, 2021
6d7752f
[NEW] Audio and Video calling in Livechat using Jitsi and WebRTC (#23…
murtaza98 Nov 22, 2021
4c9c2e6
[IMPROVE] Engagement Dashboard (#23547)
tassoevan Nov 22, 2021
34cb351
[FIX][ENTERPRISE] OAuth "Merge Roles" removes roles from users (#23588)
matheusbsilva137 Nov 22, 2021
7c8b4e5
[FIX] New specific endpoint for contactChatHistoryMessages with right…
tiagoevanp Nov 22, 2021
ecac14d
[IMPROVE] Improve the add user drop down for add a user in create cha…
dougfabris Nov 22, 2021
3843e4b
Chore: Bump livechat to 1.10 (#23768)
KevLehman Nov 22, 2021
9305434
Chore: add index on appId + associations for apps_persistence collect…
KevLehman Nov 22, 2021
0cf8e8b
[NEW] Rate limiting for user registering (#23732)
ostjen Nov 22, 2021
debcaf7
[NEW] Enable LDAP manual sync to deployments without EE license (#23761)
rodrigok Nov 23, 2021
ed2b4f9
Chore: Remove duplicated 'name' key from rate limiter logs (#23771)
sampaiodiego Nov 23, 2021
f9469fc
Regression: Fix sendMessagesToAdmins not in Fiber (#23770)
sampaiodiego Nov 23, 2021
2f44280
[FIX] Registration not possible when any user is blocked for multiple…
ostjen Nov 23, 2021
8ccbf9f
Chore: Update settings.ts (#23769)
ggazzo Nov 23, 2021
bfa43b8
Bump version to 4.2.0-rc.0
sampaiodiego Nov 23, 2021
f9b2070
Regression: Fix LDAP sync route (#23775)
ggazzo Nov 23, 2021
194a600
Regression: Fix incorrect API path for Livechat calls (#23778)
murtaza98 Nov 23, 2021
58b2763
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Nov 23, 2021
3d5bb9d
Bump version to 4.2.0-rc.1
sampaiodiego Nov 23, 2021
9ce2291
Regression: Fix sort param on omnichannel endpoints (#23789)
KevLehman Nov 25, 2021
8a9f5d0
Regression: Include files on EE services build (#23793)
sampaiodiego Nov 26, 2021
182e3e7
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Nov 26, 2021
63dc8c3
Bump version to 4.2.0-rc.2
sampaiodiego Nov 26, 2021
1ed18b7
Regression: Add @rocket.chat/emitter to EE services (#23802)
sampaiodiego Nov 26, 2021
5bd48d8
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Nov 26, 2021
479bb09
Bump version to 4.2.0-rc.3
sampaiodiego Nov 26, 2021
6d4784e
Regression: Current Chats not Filtering (#23803)
MartinSchoeler Nov 26, 2021
2f050e8
Regression: Mark Livechat WebRTC video calling as alpha (#23813)
murtaza98 Nov 29, 2021
3b6ebac
i18n: Language update from LingoHub 🤖 on 2021-11-29Z (#23812)
lingohub[bot] Nov 29, 2021
91bc421
Regression: "When is the chat busier" and "Users by time of day" char…
matheusbsilva137 Nov 29, 2021
44127c7
[FIX] LDAP users being disabled when an AD security policy is enabled…
pierre-lehnen-rc Nov 29, 2021
3b27db4
Regression: Add trash to raw models (#23774)
sampaiodiego Nov 30, 2021
068ab43
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Nov 30, 2021
32b3b89
Bump version to 4.2.0-rc.4
sampaiodiego Nov 30, 2021
6be430d
Bump version to 4.2.0
sampaiodiego Nov 30, 2021
a4ad199
Merge pull request #23825 from RocketChat/release-4.2.0
sampaiodiego Nov 30, 2021
c9ce201
Bump version to 4.3.0-develop
sampaiodiego Nov 30, 2021
2a2cd5c
Merge pull request #23827 from RocketChat/develop-sync
sampaiodiego Dec 1, 2021
1a71c70
[FIX] error after properly deleting user from admin panel #23690
Aman-Maheshwari Dec 1, 2021
76a4380
Chore: Replace new typography (#23756)
juliajforesti Dec 1, 2021
a0ed0b1
Chore: Change Menu props to accept next fuselage version (#23839)
ggazzo Dec 2, 2021
8b90ef8
[IMPROVE] Rewrite remove room invite modal #23781
dougfabris Dec 2, 2021
9e7fcb1
[FIX] Missing custom user status ellipsis (#23831)
dougfabris Dec 2, 2021
cf04144
[FIX] Add CSP to authorize auto-close of CAS login window (#23215)
goyome Dec 3, 2021
eb84220
[NEW] Create new setting to clean local storage at end of chats(#23821)
tiagoevanp Dec 3, 2021
aec724f
[FIX] No hover effect for items in kebab menu. #23712
Aman-Maheshwari Dec 3, 2021
049956c
Chore: Create script to add new migrations (#23822)
KevLehman Dec 3, 2021
ef94c08
Fix inactive user creation (#23859)
matheusbsilva137 Dec 3, 2021
4a7fd1f
[FIX] Wrong button for non trials apps (#23861)
rique223 Dec 6, 2021
59e5c2d
i18n: Language update from LingoHub 🤖 on 2021-12-06Z (#23873)
lingohub[bot] Dec 6, 2021
abc59e1
Regression: Missing padding in popover with custom template (#23877)
dougfabris Dec 6, 2021
7abd408
Merge remote-tracking branch 'origin/develop' into livechat-voip/deve…
amolghode1981 Dec 7, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"presets": [
"@babel/preset-env"
"@babel/preset-env",
"@babel/preset-react"
]
}
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 4.1.0-develop
ENV RC_VERSION 4.3.0-develop

MAINTAINER buildmaster@rocket.chat

Expand Down
5 changes: 3 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@ public/packages/rocketchat_videobridge/client/public/external_api.js
packages/tap-i18n/lib/tap_i18next/tap_i18next-1.7.3.js
private/moment-locales/
public/livechat/
!.scripts
public/pdf.worker.min.js
public/workers/**/*
imports/client/**/*
!/.storybook/
ee/server/services/dist/**
!/.mocharc.js
!/.mocharc.*.js
!/.scripts/
!/.storybook/
!/client/.eslintrc.js
!/ee/client/.eslintrc.js
16 changes: 14 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@
},
"plugins": [
"react",
"@typescript-eslint"
"@typescript-eslint",
"anti-trojan-source"
],
"rules": {
"func-call-spacing": "off",
Expand Down Expand Up @@ -122,7 +123,8 @@
"@typescript-eslint/no-unused-vars": ["error", {
"argsIgnorePattern": "^_",
"ignoreRestSiblings": true
}]
}],
"anti-trojan-source/no-bidi": "error"
},
"env": {
"browser": true,
Expand All @@ -144,6 +146,16 @@
"version": "detect"
}
}
},
{
"files": [
"**/*.tests.js",
"**/*.tests.ts",
"**/*.spec.ts"
],
"env": {
"mocha": true
}
}
]
}
7 changes: 7 additions & 0 deletions .github/history-manual.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,5 +123,12 @@
"sampaiodiego",
"pierre-lehnen-rc"
]
}],
"4.1.1": [{
"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
"userLogin": "sampaiodiego",
"contributors": [
"sampaiodiego"
]
}]
}