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.

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

Jump to bottom

Merge main to dev #1904

Merged
merged 108 commits into from
Sep 12, 2023
Merged

Merge main to dev #1904

merged 108 commits into from
Sep 12, 2023

Conversation

raviteja83
Copy link
Collaborator

Details(context, Jira ticket, how was the bug fixed, what does the new feature do)

Choose one of these(put a 'x' in the bracket):

  • The change doesn't require a change to the documentation.
  • The documentation is updated accordingly.

Implementation note, gotchas, related work and Future TODOs (optional)

KaustubhKumar05 and others added 30 commits September 4, 2023 12:12
@KaustubhKumar05
fix: participant list alignment
cf0378d
@amar-1995
fix: removed progress bar from player
75e4123
@raviteja83
fix: screenshare track showing video track
5139d57
@github-actions @raviteja83 @saikatmitra91
feat: setup environment for dev (#1795)
910383f 
Co-authored-by: Ravi theja <ravi.theja@100ms.live>
Co-authored-by: Saikat Mitra <saikatmitra91@gmail.com>
@KaustubhKumar05
fix: update leave css
dc55f04
@KaustubhKumar05
fix: default enable av in preview
c4bd990
@raviteja83
fix: page becoming unresponsive after starting stream (#1797)
9fcbb04 
* fix: add test logs

* refactor: extract our hls start

* fix: test log

* refactor: auto start streaming
@KaustubhKumar05
fix: hls restarts after stopping
510cb8e
@raviteja83
fix: infinite loop
a21efeb
@raviteja83
fix: remove test logs
cd01d5e
@KaustubhKumar05
fix: role accordion options
504b44d
@KaustubhKumar05
fix: chat text colors
b8c3814
@KaustubhKumar05
fix: tile menu icon size
250e512
@KaustubhKumar05
fix: toggle participant list
d93c65c
@amar-1995 @raviteja83
fix: hide audio level on hls (#1804)
57aacc9 
* fix: added check for audio indicator

* fix: pr comment

* fix: pr comment

* fix: use audio mute for audio level

* fix: remove audio level

---------

Co-authored-by: raviteja83 <ravi.theja@100ms.live>
@saikatmitra91
fix: web-2052 not getting correct end stream message for hls viewer (#…
3a337fa 
…1814)
@KaustubhKumar05
fix: update icon dimensions
cb9db29
@saikatmitra91
fix: remove from stage should be a force action
460480f
@KaustubhKumar05
fix: use layout api for chat
9741835
@KaustubhKumar05
fix: preview tile video aspect ratio
f1de6a0
@raviteja83 @saikatmitra91
fix: spacing in beam layout (#1791)
fe51dc2 
* fix: remove edge space

* fix: remove extra padding

* feat: edge to edge

* fix: aspect ratio for mweb

* fix: screenshare layout for mweb

* fix: add code comment

* fix: use isMobile for rounded tile

Co-authored-by: Saikat Mitra <saikatmitra91@gmail.com>

* fix: spacing in role prominence layout

* fix: spacing

* fix: hide pagination

* fix: spacing in screenshare

---------

Co-authored-by: Saikat Mitra <saikatmitra91@gmail.com>
@eswarclynn
fix: update mid call preview properly
e197c55
@KaustubhKumar05
fix: chat, message design parity
48acd92
@KaustubhKumar05
fix: wire brb to layout
e551771
@raviteja83
fix: blur overflow
3119e96
@raviteja83
fix: spacing between tiles for beam
5231dd8
@amar-1995
fix: gradient token added
0fa10af
@raviteja83
fix: emoji reactions not showing up
9970379
@KaustubhKumar05
fix: color tokens for role accordion
a1de23a
@raviteja83
fix: beam layout gap
025c438
KaustubhKumar05 and others added 19 commits September 11, 2023 11:36
@KaustubhKumar05
fix: hide name for inset
aa55590
@KaustubhKumar05
fix: chat init state controlled by footer
f963a6d
@raviteja83
refactor: chat participants, auto update ui (#1886)
4c25fac 
* refactor: chat participants

* fix: update check for participant list
@KaustubhKumar05
fix: vb for role change
554a3e2
@raviteja83
fix: extra notification on role change decline, handraise
79d597f
@raviteja83
fix: screenshare tile controls showing in beam
9480f67
@raviteja83
fix: add null check
71ece5d
@KaustubhKumar05
feat: prebuilt header
189c4f9
@github-actions
build: update versions for alpha release
e901762
@amar-1995
fix: hls stream recover after network disconnection (#1883)
a3cedc7 
* fix: hls stream recover after newtwork disconnection

* fix: updated the version of hls.js
@raviteja83
fix: handraise flow (#1896)
f7561db
@KaustubhKumar05
fix: ui for chat, participant list
4eb0e8b
@raviteja83
fix: extra handraise notification
e88e690
@KaustubhKumar05
fix: accordion css
3230b9e
@KaustubhKumar05
fix: typo, hide custom header for mweb
5464551
@raviteja83
fix: chat/particiants tab
dae85f9
@KaustubhKumar05
fix: show logo in mweb header
7b2f038
@raviteja83
fix: add null check in screenshare tile
f4385a0
@raviteja83
Merge branch 'main' into merge-main-to-dev
cc2eb30
@vercel
Copy link

vercel bot commented Sep 12, 2023 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
dashboard-app ✅ Ready (Inspect) Visit Preview 💬 Add feedback Sep 12, 2023 9:05am
storybook-app ✅ Ready (Inspect) Visit Preview 💬 Add feedback Sep 12, 2023 9:05am

@github-actions
Copy link
Contributor

A JIRA Issue ID is missing from your branch name! 🦄

Your branch: merge-main-to-dev

If this is your first time contributing to this repository - welcome!

Please refer to jira-lint to get started.

Without the JIRA Issue ID in your branch name you would lose out on automatic updates to JIRA via SCM; some GitHub status checks might fail.

Valid sample branch names:

‣ feature/shiny-new-feature--mojo-10'
‣ 'chore/changelogUpdate_mojo-123'
‣ 'bugfix/fix-some-strange-bug_GAL-2345'

@github-actions
Copy link
Contributor

A JIRA Issue ID is missing from your branch name! 🦄

Your branch: merge-main-to-dev

If this is your first time contributing to this repository - welcome!

Please refer to jira-lint to get started.

Without the JIRA Issue ID in your branch name you would lose out on automatic updates to JIRA via SCM; some GitHub status checks might fail.

Valid sample branch names:

‣ feature/shiny-new-feature--mojo-10'
‣ 'chore/changelogUpdate_mojo-123'
‣ 'bugfix/fix-some-strange-bug_GAL-2345'

@raviteja83 raviteja83 merged commit daf586c into dev Sep 12, 2023
2 of 4 checks passed
@raviteja83 raviteja83 deleted the merge-main-to-dev branch September 12, 2023 09:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KaustubhKumar05 KaustubhKumar05 KaustubhKumar05 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@raviteja83 @KaustubhKumar05 @amar-1995 @saikatmitra91 @eswarclynn