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

PR for main to dev backmerge #2307

Merged
merged 44 commits into from
Dec 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
8bf1b34
build: merge main with production
eswarclynn Aug 10, 2023
c4548ba
Merge branch 'main' into merge-main
raviteja83 Aug 11, 2023
e1c7000
build: update lock file
raviteja83 Aug 11, 2023
09d366d
feat: merge main to production
raviteja83 Aug 11, 2023
3b03d94
fix: react popper reference is not a function
saikatmitra91 Aug 13, 2023
4ef9174
fix: remove tldraw dependency for whiteboard in prebuilt
saikatmitra91 Aug 14, 2023
69fa2cb
Merge branch 'main' into resolve-prod-conflicts
raviteja83 Aug 24, 2023
5073cdb
feat: merge main to prod
raviteja83 Aug 24, 2023
66df033
feat: merge main
raviteja83 Aug 25, 2023
befd4c6
feat: merge main to prod
raviteja83 Sep 8, 2023
fff580c
feat: merge main to prod
raviteja83 Sep 8, 2023
8a542e8
Production release PR (#1887)
github-actions[bot] Sep 13, 2023
c0caeaf
Merge branch 'main' into merge-main-to-prod
raviteja83 Sep 13, 2023
a9106e1
Merge main to prod
raviteja83 Sep 13, 2023
9de837c
fix: make preview/meeting conditional (#1919)
raviteja83 Sep 13, 2023
045fd6f
feat: merge main to prod
raviteja83 Sep 22, 2023
4992eb1
fix: play button design in hls mweb
github-actions[bot] Sep 22, 2023
55f54c0
feat: merge main to prod
raviteja83 Sep 22, 2023
c337844
Production release PR (#1986)
raviteja83 Oct 9, 2023
e118426
fix: remove leave prompt
KaustubhKumar05 Oct 11, 2023
a7abb1a
Production release PR
raviteja83 Oct 25, 2023
286950c
Production release PR
raviteja83 Nov 6, 2023
c3dc43a
Production release PR
raviteja83 Nov 14, 2023
a3d2a0b
fix: create separate worker threads
raviteja83 Nov 17, 2023
4206825
Merge branch 'main' into production
raviteja83 Nov 28, 2023
af3ea7f
Merge main to production (#2193)
raviteja83 Nov 28, 2023
2c178ad
fix: character usage
KaustubhKumar05 Nov 28, 2023
668f085
Merge branch 'main' into production
raviteja83 Dec 1, 2023
b556641
fix: typo
raviteja83 Dec 1, 2023
7221b6b
Production release PR
raviteja83 Dec 1, 2023
648c4ff
Production release PR (#2237)
github-actions[bot] Dec 8, 2023
8bbbc18
feat: close existing screenshare or whiteboard when the other is started
eswarclynn Dec 14, 2023
73e47b0
Revert "feat: close existing screenshare or whiteboard when the other…
raviteja83 Dec 14, 2023
7cf4512
fix: show border color after polls ended
amar-1995 Dec 14, 2023
65364b9
fix: screenshare and whiteboard toggle
eswarclynn Dec 15, 2023
49e5565
fix: text copy and error code
raviteja83 Dec 15, 2023
a033731
QA Handover PR (#2296)
raviteja83 Dec 15, 2023
43d97d8
Merge branch 'main' into production
raviteja83 Dec 15, 2023
96b55ba
build: update versions for release
github-actions[bot] Dec 15, 2023
474f94a
Merge branch 'main' into production
raviteja83 Dec 15, 2023
adc0fee
Production Release PR (#2302)
raviteja83 Dec 15, 2023
1f2e754
Production backmerge to main (#2310)
raviteja83 Dec 15, 2023
39e90f7
fix: active speaker sorting
raviteja83 Dec 15, 2023
096d50e
fix: sort active speaker only on first page
raviteja83 Dec 15, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/100ms-custom-app/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions apps/100ms-web/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/hls-player/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/hls-stats/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/hms-noise-suppression/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/hms-video-store/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/hms-video-web/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/hms-virtual-background/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/react-icons/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/react-sdk/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions packages/roomkit-react/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions packages/roomkit-react/src/Prebuilt/common/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,15 +121,15 @@ export enum INTERACTION_TYPE {
export enum QUESTION_TYPE_TITLE {
'single-choice' = 'Single Choice',
'multiple-choice' = 'Multiple Choice',
// "short-answer": "Short Answer",
// "long-answer": "Long Answer",
'short-answer' = 'Short Answer',
'long-answer' = 'Long Answer',
}

export enum QUESTION_TYPE {
SINGLE_CHOICE = 'single-choice',
MULTIPLE_CHOICE = 'multiple-choice',
// SHORT_ANSWER: "short-answer",
// LONG_ANSWER: "long-answer",
SHORT_ANSWER = 'short-answer',
LONG_ANSWER = 'long-answer',
}

export const ROLE_CHANGE_DECLINED = 'role_change_declined';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,17 @@ export const GridLayout = ({

useEffect(() => {
if (mainPage !== 0) {
peersSorter.stop();
return;
}
peersSorter.setPeersAndTilesPerPage({
peers: updatedPeers,
tilesPerPage: pageSize,
});
peersSorter.onUpdate(setSortedPeers);
return () => {
peersSorter.stop();
};
}, [mainPage, peersSorter, updatedPeers, pageSize]);

if (peerSharing) {
Expand Down
4 changes: 2 additions & 2 deletions packages/roomkit-web/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading