Anton Georgiev
|
97682d9162
|
Revert "Merge pull request #8759 from capilkey/2.2-join-fix"
This reverts commit 5af41dabb4, reversing
changes made to 004d872584.
|
2020-03-25 16:12:36 -04:00 |
|
Chad Pilkey
|
e9a73217da
|
only join a user if the connection is still active
|
2020-03-11 13:40:50 -07:00 |
|
Chad Pilkey
|
6456ad0010
|
add meetingId to some server-side collection selectors
|
2020-03-04 07:54:32 -08:00 |
|
Anton Georgiev
|
4e1d55efd2
|
Prevent parallel screenshare and external-video
|
2019-12-18 16:40:04 -05:00 |
|
Tainan Felipe
|
957225fabf
|
Rename collection to video-streams
|
2019-09-06 13:50:31 -03:00 |
|
Tainan Felipe
|
c27ff18958
|
Merge remote-tracking branch 'upstream/master' into video-performance
|
2019-09-06 10:16:22 -03:00 |
|
Tainan Felipe
|
060e82dddf
|
Move hasStream to video-users collection
|
2019-09-05 15:29:30 -03:00 |
|
Anton Georgiev
|
7ec10d779a
|
adjust flipped check for Moderator, isGuest, etc
|
2019-08-30 16:13:40 -04:00 |
|
Anton Georgiev
|
26da08c3a8
|
Merge pull request #7861 from Tainan404/userlist-rerendering
Reduce Userlist Renderings
|
2019-08-09 14:15:10 -04:00 |
|
Tainan Felipe
|
f2bc6553c8
|
Remove unnecessary variable
|
2019-07-30 14:13:47 -03:00 |
|
Tainan Felipe
|
1b2dff4b64
|
Remove moderator property
|
2019-07-30 10:56:20 -03:00 |
|
Tainan Felipe
|
a3b33a64a9
|
Remove leftovers
|
2019-07-30 10:09:03 -03:00 |
|
Tainan Felipe
|
73cf694a69
|
Reduce the amount of userlist renders
|
2019-07-30 09:03:10 -03:00 |
|
Tainan Felipe
|
b570c87d38
|
WIP
|
2019-07-29 11:29:31 -03:00 |
|
Joao Siebel
|
d556661873
|
save settings in a collection. close #7774
|
2019-07-29 11:17:38 -03:00 |
|
Chad Pilkey
|
f0930e2d23
|
refactor user role management to follow proper format
|
2019-06-28 21:02:12 +00:00 |
|
Chad Pilkey
|
0de1d1d129
|
fix regression from #7606, handle roles correctly
|
2019-06-28 18:50:57 +00:00 |
|
Joao Siebel
|
cb22710917
|
update logging for settings changes
|
2019-06-27 14:01:14 -03:00 |
|
Anton Georgiev
|
5fb0c10ea6
|
Merge branch 'master' into issue-7556
|
2019-06-21 10:44:32 -04:00 |
|
Chad Pilkey
|
6e26a1c73d
|
fix for voice-only users not appearing in the audio
|
2019-06-13 18:33:11 +00:00 |
|
Tainan Felipe
|
d948a6a008
|
Add toast for webcam lock suggestion
|
2019-06-12 15:03:23 -03:00 |
|
Joao Siebel
|
8ba90b2121
|
Merge remote-tracking branch 'upstream/master' into network-indicator
|
2019-05-23 15:42:38 -03:00 |
|
Joao Siebel
|
a2d2dc332f
|
fix a problem with local stream and update the code
|
2019-05-23 15:25:31 -03:00 |
|
Tainan Felipe
|
2f63c174a3
|
Fix youtube keeps playing audio when user left the meeting
|
2019-05-17 16:39:05 -03:00 |
|
Joao Siebel
|
fea22d5eef
|
add flag to enable monitoring, correct who can see network problems and update logic
|
2019-05-09 18:25:29 -03:00 |
|
Joao Siebel
|
5ad451cfff
|
prevent unnecessary network information update
|
2019-04-23 09:02:15 -03:00 |
|
Joao Siebel
|
c98db398fc
|
Merge remote-tracking branch 'upstream/master' into network-indicator
|
2019-04-22 09:18:02 -03:00 |
|
Joao Siebel
|
dcbce93e7c
|
add webcams data collector
|
2019-04-12 11:11:36 -03:00 |
|
Maxim Khlobystov
|
d7d69d1c98
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into user-information-lookup
|
2019-04-05 18:46:47 -04:00 |
|
Maxim Khlobystov
|
3fa22c6908
|
User information lookup feature in HTML5 client.
|
2019-04-05 18:32:21 -04:00 |
|
Joao Siebel
|
701911734b
|
Merge remote-tracking branch 'upstream/master' into network-indicator
|
2019-03-25 09:52:33 -03:00 |
|
Joao Siebel
|
3cfc64ac89
|
Merge remote-tracking branch 'upstream/master' into user-inactivity-update
|
2019-03-14 09:29:52 -03:00 |
|
Joao Siebel
|
cb3763ca31
|
Adjust messages when removed or by inactivity. close #6911 close #6928
|
2019-03-12 15:02:52 -03:00 |
|
gustavotrott
|
e5c26c60ef
|
Implement slow connection indicator
|
2019-03-11 21:34:34 -03:00 |
|
Chad Pilkey
|
9940846ff9
|
clean up issues introduced in #6869
|
2019-03-08 18:02:46 -08:00 |
|
Anton Georgiev
|
e174a2a197
|
Merge pull request #6869 from Tainan404/issue-6717
Add pending/guest users waiting to approval panel
|
2019-03-08 17:12:28 -05:00 |
|
Joao Siebel
|
b5929dc4b5
|
Add activity check modal
|
2019-02-26 14:40:01 -03:00 |
|
Tainan Felipe
|
3648afcf3f
|
Add pending/guest users waiting to approval panel
|
2019-02-26 14:08:15 -03:00 |
|
Joao Siebel
|
681df8a546
|
handle user inactivity inspect on server
|
2019-02-21 18:09:44 -03:00 |
|
Anton Georgiev
|
827be6e9cd
|
Merge pull request #6806 from jfsiebel/stop-sync-video
Stop external video sharing when current presenter leaves
|
2019-02-20 13:24:18 -05:00 |
|
Anton Georgiev
|
40caed3924
|
Merge pull request #6734 from Tainan404/issue-6666
Allow re-invite user that didn't joined in meeting
|
2019-02-19 13:39:22 -05:00 |
|
Joao Siebel
|
4a7a7fd661
|
stop sharing video if presenter leaves. close #6596
|
2019-02-19 09:14:29 -03:00 |
|
Anton Georgiev
|
a61e3e17d3
|
Revert "Fix error when user is not moderator"
|
2019-02-11 17:14:35 -05:00 |
|
Tainan Felipe
|
e4488b9769
|
Add breakoutProps to users collection
|
2019-02-07 15:56:33 -02:00 |
|
Tainan Felipe
|
a566fafcaa
|
Allow re-invite user that didn't joined in meeting
|
2019-02-07 14:42:47 -02:00 |
|
Vitor Mateus
|
879c99be90
|
Fix error when user is not moderator
|
2019-02-07 12:01:03 -02:00 |
|
Vitor Mateus
|
a9989e1107
|
Fix chat alert (push and audio) #6430
|
2019-01-14 11:23:35 -02:00 |
|
Anton Georgiev
|
afa1a64e79
|
improve format of callbacks on collection document removal
|
2018-12-14 20:19:10 +00:00 |
|
Ghazi Triki
|
653fd74440
|
Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into merge-2.x-release-into-master
# Conflicts:
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserLeaveReqMsgHdlr.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/HandlerHelpers.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/testdata/FakeTestData.scala
# bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
# bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java
# bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java
# bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Office2PdfPageConverter.java
# bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeDocumentValidator.java
# bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
# bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PdfToSwfSlidesGenerationService.java
# bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/SvgImageCreatorImp.java
# bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/TextFileCreatorImp.java
# bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
# bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
# bigbluebutton-client/src/org/bigbluebutton/core/UsersUtil.as
# bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
# bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
# bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
# bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
# bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
# bigbluebutton-client/src/org/red5/flash/bwcheck/app/BandwidthDetectionApp.as
# bigbluebutton-config/bigbluebutton-release
# bigbluebutton-html5/client/compatibility/kurento-extension.js
# bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
# bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
|
2018-11-01 14:00:54 +01:00 |
|
Chad Pilkey
|
81983ae1e1
|
Stop HTML5 ejecting from voice on reconnect and fix voice user creation
|
2018-10-24 11:40:38 -07:00 |
|