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

[stable20.1] ↕️ Split participants into 👤 Attendees and ⏳ Sessions #4612

Merged
merged 129 commits into from
Dec 9, 2020
Merged

[stable20.1] ↕️ Split participants into 👤 Attendees and ⏳ Sessions #4612

merged 129 commits into from
Dec 9, 2020

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Nov 16, 2020 •
edited by nickvergessen
Loading

⚠️ This backport had conflicts and is incomplete ⚠️

Backport of #4324
Backport of #4496
Backport of #4682
Backport of #4689

@backportbot-nextcloud backportbot-nextcloud bot added this to the 💛 Next Minor (20) milestone Nov 16, 2020
@nickvergessen nickvergessen self-assigned this Nov 16, 2020
@nickvergessen nickvergessen force-pushed the backport/4324/stable20 branch 2 times, most recently from 4b5e836 to f99c548 Compare November 26, 2020 18:28
This was referenced Nov 27, 2020
Merged
Merged
@nickvergessen
Copy link
Member

nickvergessen commented Nov 30, 2020 •
edited
Loading 

diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue
index 1955b70b84..0e6af1384b 100644
--- a/src/components/TopBar/TopBar.vue
+++ b/src/components/TopBar/TopBar.vue
@@ -143,7 +143,7 @@
 				<ActionCheckbox
 					v-if="canUserEnableSIP"
 					:checked="hasSIPEnabled"
-					@change="toggleSIPEnabled">
+					@update:checked="toggleSIPEnabled">
 					{{ t('spreed', 'Enable SIP dial-in') }}
 				</ActionCheckbox>
 			</template>

@nickvergessen nickvergessen changed the base branch from stable20 to stable20.1 December 9, 2020 10:37
@nickvergessen
Only use numeric tokens for conversations when sip is configured
e46c2b5 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Add a setting which groups can enable SIP in conversations
07adec8 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Add dial-in info and fix group display names
208d4f9 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Add SIP status column to rooms table
2324879 
Signed-off-by: Joas Schilling <coding@schilljs.com>
nickvergessen and others added 21 commits December 9, 2020 11:38
@nickvergessen
Also load the session information when we load an attendee
95cb019 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
When the HPB provided a session id only join/leave with that session
77beca4 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Update baseline
c3ecbe5 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Refresh the peer list and take the display name from there
f9ce265 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Use a new VideoBackground component when we get a userId
a12d505 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Fix baseline
35b9741 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Also check the room token when suggesting if SIP can be enabled
c4ebfd6 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Simplify getting the participant
23dbda8 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Update baseline
2994970 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Load new participants by actor when the session does not exist yet
e7c5f8b 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@PVince81 @nickvergessen
Unregister refreshPeerList on unmount
a47e6b0 
Fix copy-paste issue, replacing "$on" with "$off" when unmounting the
call view.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
@nickvergessen
Make sure the key calculation is always unique
bfdd59c 
before it was s#0 for all email invites

Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Guests should not see the settings panel
e660315 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Return SIP and attendee information when interacting with rooms API
eafe295 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Generate a attendee pin for the moderator when enabling SIP and retur…
ef45b2c 
…n it

Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Add docs and capability
1136041 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Make sure we always generate a PIN for users when SIP is enabled
252338d 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Expose the dial-in information to clients
0d18940 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Correctly toggle the ActionCheckbox
55aa2ef 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Fix return code when user can not enable SIP
896cd6b 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Fix unit tests
d6f8ae1 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen nickvergessen changed the title [stable20] ↕️ Split participants into 👤 Attendees and ⏳ Sessions [stable20.1] ↕️ Split participants into 👤 Attendees and ⏳ Sessions Dec 9, 2020
@nickvergessen
Update baseline
c23c828 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen nickvergessen force-pushed the backport/4324/stable20 branch from 95e26c4 to c23c828 Compare December 9, 2020 10:48
@nickvergessen
Copy link
Member

rebased onto 20.1 so let's see if CI goes green and then merge

@nickvergessen
Bump version
c33fad3 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Fix server target testing branch
97153c6 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen nickvergessen merged commit e8fc6b2 into stable20.1 Dec 9, 2020
@nickvergessen nickvergessen deleted the backport/4324/stable20 branch December 9, 2020 11:40
@nickvergessen nickvergessen mentioned this pull request Dec 18, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nickvergessen nickvergessen

Labels
2. developing enhancement feature: SFU & SIP ☎️
Projects
None yet
Milestone
v10.1.0
Development

Successfully merging this pull request may close these issues.
3 participants
@nickvergessen @fancycode @PVince81