Joao Siebel
|
96bd372f15
|
Fix banned users log
|
2020-09-08 13:56:17 -03:00 |
|
Joao Siebel
|
4be9bc4c94
|
Adjust publishers to use auth-token-validation collection
|
2020-09-01 13:31:11 -03:00 |
|
Joao Siebel
|
2873eb2c1b
|
Merge remote-tracking branch 'upstream/develop' into connection-manager
|
2020-09-01 09:08:33 -03:00 |
|
Joao Siebel
|
b8f42ac712
|
Create ClientConnections structure and auth-token-validation collection
|
2020-09-01 09:07:56 -03:00 |
|
Anton Georgiev
|
14f464087f
|
Merge pull request #8417 from pedrobmarin/backend-cleanup
Backend cleanup
|
2020-08-28 15:37:00 -04:00 |
|
KDSBrowne
|
e9d4f8e42c
|
adds a select random user feature for presenter
|
2020-08-28 17:23:27 +00:00 |
|
root
|
851c2645ea
|
Committer: Antonio Guirado <amguirado73@gmail.com>
Changes to be committed:
new file: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/ExternalVideoApp2x.scala
new file: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/StartExternalVideoPubMsgHdlr.scala
new file: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/StopExternalVideoPubMsgHdlr.scala
new file: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/UpdateExternalVideoPubMsgHdlr.scala
modified: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
modified: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
modified: akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala
new file: bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/ExternalVideoMsgs.scala
new file: bigbluebutton-html5/imports/api/external-videos/server/eventHandlers.js
new file: bigbluebutton-html5/imports/api/external-videos/server/handlers/startExternalVideo.js
new file: bigbluebutton-html5/imports/api/external-videos/server/handlers/stopExternalVideo.js
new file: bigbluebutton-html5/imports/api/external-videos/server/handlers/updateExternalVideo.js
modified: bigbluebutton-html5/imports/api/external-videos/server/index.js
modified: bigbluebutton-html5/imports/api/external-videos/server/methods.js
modified: bigbluebutton-html5/imports/api/external-videos/server/methods/emitExternalVideoEvent.js
modified: bigbluebutton-html5/imports/api/external-videos/server/methods/startWatchingExternalVideo.js
modified: bigbluebutton-html5/imports/api/external-videos/server/methods/stopWatchingExternalVideo.js
new file: bigbluebutton-html5/imports/api/external-videos/server/streamer.js
modified: bigbluebutton-html5/imports/api/meetings/server/handlers/meetingDestruction.js
modified: bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeeting.js
modified: bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js
modified: bigbluebutton-html5/imports/api/users/server/handlers/validateAuthToken.js
modified: bigbluebutton-html5/imports/api/users/server/store/bannedUsers.js
modified: bigbluebutton-html5/imports/startup/server/index.js
modified: bigbluebutton-html5/imports/startup/server/redis.js
modified: bigbluebutton-html5/imports/ui/components/external-video-player/service.js
modified: bigbluebutton-html5/private/config/settings.yml
|
2020-08-28 12:58:55 +02:00 |
|
Joao Siebel
|
f33bd10640
|
Remove user from collection when leaves
|
2020-08-19 13:22:43 -03:00 |
|
Anton Georgiev
|
5be5aed1d9
|
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2020-08-12
|
2020-08-12 17:12:58 +00:00 |
|
Anton Georgiev
|
9aefa76ded
|
allow more tags in welcome message/ mod only message
|
2020-08-10 16:59:09 -04:00 |
|
Anton Georgiev
|
0d6faa0b57
|
only allow for https uri in welcome and modOnly messages
|
2020-07-29 16:08:47 -04:00 |
|
Anton Georgiev
|
2c32608cd5
|
allow for img tag in welcome and modOnly messages
|
2020-07-29 15:09:15 -04:00 |
|
Anton Georgiev
|
1ea72ccb95
|
sanitize modOnlyMessage in html5 client
|
2020-07-29 11:31:00 -04:00 |
|
Anton Georgiev
|
4456a4db1f
|
move sanitazing of welcome message to backend
|
2020-07-27 16:33:10 -04:00 |
|
Pedro Beschorner Marin
|
526f79e8f2
|
Merge remote-tracking branch 'bigbluebutton/v2.2.x-release' into bigbluebutton/develop
|
2020-06-30 18:15:18 -03:00 |
|
Anton Georgiev
|
0cb7759cb2
|
Merge pull request #9824 from jfsiebel/fix-banned-users-join-try
Prevent banned user from trying to validateAuthToken multiple times
|
2020-06-17 17:09:40 -04:00 |
|
Anton Georgiev
|
778695b4d9
|
Merge pull request #9758 from jfsiebel/clear-video-streams
Clear video streams collection
|
2020-06-16 16:20:56 -04:00 |
|
Joao Siebel
|
3e95ed0e4b
|
Merge remote-tracking branch 'upstream/v2.2.x-release' into merge-2.2
|
2020-06-16 16:40:56 -03:00 |
|
Joao Siebel
|
45f99fed8b
|
Prevent banned user from trying to validate auth token multiple times. close #9798
|
2020-06-12 13:24:11 -03:00 |
|
Joao Siebel
|
6c6825d101
|
Subscribe to collections when user role change. close #9733
|
2020-06-05 10:32:05 -03:00 |
|
Joao Siebel
|
e3692e5321
|
Clear video streams collection on meeting end. close #9154
|
2020-06-03 13:29:44 -03:00 |
|
Anton Georgiev
|
ac6fd2824c
|
Merge branch 'develop' into 2.3-audio-stats
|
2020-05-26 12:36:15 -04:00 |
|
Anton Georgiev
|
aeeac803c7
|
Merge pull request #9620 from antobinary/simplify-publish
Simplify the code used for promote-demote subscriptions
|
2020-05-21 17:14:16 -04:00 |
|
Anton Georgiev
|
5238d81193
|
Simplify the code used for promote-demote subscriptions
|
2020-05-20 17:07:36 -04:00 |
|
Anton Georgiev
|
201fa2902e
|
Only provide modOnlyMessage to moderators. Promoted mod requires refresh to see it
|
2020-05-20 15:56:44 -04:00 |
|
Pedro Beschorner Marin
|
22c8eee0c7
|
Connection status first commit
|
2020-05-14 10:32:55 -03:00 |
|
Chad Pilkey
|
6456ad0010
|
add meetingId to some server-side collection selectors
|
2020-03-04 07:54:32 -08:00 |
|
Chad Pilkey
|
6a4ba7a300
|
watch for voice call state updates instead of DTMFs in the client
|
2020-02-18 14:03:06 -08:00 |
|
Anton Georgiev
|
11edb3cae9
|
clear externalvideo stream properly on meeting removed
|
2020-02-13 16:01:36 -05:00 |
|
Anton Georgiev
|
a8f4827af8
|
utilize Meteor connection id instead of trusting client side meetingId, userId
|
2020-02-06 15:48:16 -05:00 |
|
Pedro Beschorner Marin
|
b11113c165
|
Remove meeting inactivity monitor
|
2019-12-11 17:11:57 -03:00 |
|
Joao Siebel
|
9ed813ea3a
|
Remove streamers on meeting end
|
2019-11-13 13:53:45 -03:00 |
|
Joao Siebel
|
72cc05abee
|
Merge with cursor streamer stuff
|
2019-10-31 19:20:46 -03:00 |
|
Joao Siebel
|
d5865d49db
|
Update cursor streams logic
|
2019-10-24 17:49:21 -03:00 |
|
Joao Siebel
|
bbbd97929d
|
Merge remote-tracking branch 'upstream/master' into update-annotations-streamer
|
2019-10-24 10:41:20 -03:00 |
|
Lucas Zawacki
|
47661f2b08
|
Don't initialize streamer more than once, delete streamer object when meeting ends
|
2019-10-23 16:21:10 -03:00 |
|
Joao Siebel
|
d0f0d91c01
|
Update annotations streams logic
|
2019-10-22 22:26:25 -03:00 |
|
Chad Pilkey
|
9a0c97e50c
|
Merge pull request #8077 from jfsiebel/lock-modal-update
Update lock viewers modal
|
2019-10-03 13:27:28 -04:00 |
|
Tainan Felipe
|
80a8d29113
|
Fix typo
|
2019-09-09 11:48:50 -03:00 |
|
Tainan Felipe
|
d3b9db47e8
|
Move remaining time from meeting collection to meetingRecordingTime collection
|
2019-09-09 11:29:59 -03:00 |
|
Joao Siebel
|
4f00c6b994
|
Update lock viewers modal
With this changes you need to click apply button
in order to lock have effect, also update the lock text.
close #7766
|
2019-09-09 11:21:54 -03:00 |
|
Anton Georgiev
|
7ec10d779a
|
adjust flipped check for Moderator, isGuest, etc
|
2019-08-30 16:13:40 -04:00 |
|
Anton Georgiev
|
892336632f
|
added "fields:{...}", removed most mapUser
|
2019-08-28 16:32:55 -04:00 |
|
Tainan Felipe
|
2ee12df878
|
Clear record props when the meeting ends
|
2019-08-27 09:53:53 -03:00 |
|
Tainan Felipe
|
a7f19778ff
|
Remove leftovers
|
2019-08-21 15:57:34 -03:00 |
|
Tainan Felipe
|
932c5bf58c
|
Fix nav bar performance issue and move recordProp to own collection
|
2019-08-21 14:42:37 -03:00 |
|
Chad Pilkey
|
027c28c320
|
add lock setting option to hide viewers from each other
|
2019-08-09 16:45:26 -07:00 |
|
Joao Siebel
|
d556661873
|
save settings in a collection. close #7774
|
2019-07-29 11:17:38 -03:00 |
|
KDSBrowne
|
1bccb5b660
|
fix webcams of other viewers lock toggle
|
2019-07-18 15:48:18 +00:00 |
|
Chad Pilkey
|
87381b240e
|
change unsafe Users upserts to updates
|
2019-07-06 23:47:33 +00:00 |
|
Anton Georgiev
|
86d33bbc1c
|
Merge pull request #7712 from MaximKhlobystov/user-ejection-permission-error
Prevent user from being ejected when confirming start/stop recording or end meeting after losing moderator role
|
2019-07-04 15:29:02 -04:00 |
|
Maxim Khlobystov
|
5f6a1c3a08
|
Add additional checks to verify that the user exists + Small cleanup
|
2019-07-04 15:25:25 -04:00 |
|
Maxim Khlobystov
|
e7d7094d4c
|
Move the moderator checks for toggleRecording and endMeeting from client side to server side
|
2019-07-03 14:10:28 -04:00 |
|
Chad Pilkey
|
f0930e2d23
|
refactor user role management to follow proper format
|
2019-06-28 21:02:12 +00:00 |
|
Tainan Felipe
|
d948a6a008
|
Add toast for webcam lock suggestion
|
2019-06-12 15:03:23 -03:00 |
|
Anton Georgiev
|
ac36732849
|
Merge branch 'master' into closed-captions-prototype
|
2019-05-29 11:51:45 -04:00 |
|
Anton Georgiev
|
91e3298c84
|
Merge pull request #7488 from KDSBrowne/02-poll-published-toast
Stop obsolete toasts for published polls
|
2019-05-29 08:54:57 -04:00 |
|
Joao Siebel
|
a2d2dc332f
|
fix a problem with local stream and update the code
|
2019-05-23 15:25:31 -03:00 |
|
KDSBrowne
|
0f3120e969
|
remove unused imports
|
2019-05-23 14:16:52 +00:00 |
|
Pedro Beschorner Marin
|
34b39a2b0a
|
Closed captions prototype in a big commit
|
2019-05-22 18:33:20 -03:00 |
|
KDSBrowne
|
558e25ec9b
|
fix published poll toast notifications for old polls
|
2019-05-22 14:44:17 +00:00 |
|
Anton Georgiev
|
1285a49ed2
|
Merge pull request #7389 from diegobenetti/issue7314-improve-disconnection-detection
Fixes the duplicated messages when meeting is ended
|
2019-05-09 15:01:15 -04:00 |
|
Pedro Beschorner Marin
|
c27f409def
|
Locking shared notes from akka-apps up to the Flash client
|
2019-05-08 20:36:36 +00:00 |
|
Pedro Beschorner Marin
|
9867aa6b78
|
Shared notes lock settings first commit
|
2019-05-08 20:36:36 +00:00 |
|
Diego Benetti
|
4d7292f6c5
|
Added parameter to differ meeting from breakout error logs
|
2019-05-08 16:15:17 -03:00 |
|
Diego Benetti
|
77bc6aa9dc
|
Fixes the duplicated messages when meeting is ended
|
2019-05-08 14:15:25 -03:00 |
|
Pedro Beschorner Marin
|
a0590c12ea
|
Merge remote-tracking branch 'origin/master' into set-lock-settings-on-meeting-create
|
2019-05-02 11:05:34 -03:00 |
|
Richard Alam
|
47ea1bed67
|
Merge pull request #7270 from pedrobmarin/unmute-users
Unmute users
|
2019-05-01 10:52:12 -04:00 |
|
Anton Georgiev
|
f11576dbea
|
increase delay before dropping Meetings to 10s
|
2019-04-29 14:22:33 +00:00 |
|
Anton Georgiev
|
70f41c9cca
|
patch: clear collections within Fiber
|
2019-04-26 17:13:45 +00:00 |
|
Pedro Beschorner Marin
|
324681d5b2
|
Renamed unmuteUsers to allowModsToUnmuteUsers
|
2019-04-23 12:30:55 -03:00 |
|
Pedro Beschorner Marin
|
50afb24653
|
Changed from unmute only viewers to unmute anyone
|
2019-04-17 10:55:01 -03:00 |
|
Pedro Beschorner Marin
|
87435c515c
|
Merge remote-tracking branch 'master' into set-lock-settings-on-meeting-create
|
2019-04-12 13:58:58 -03:00 |
|
Maxim Khlobystov
|
7d7ef07382
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into user-information-lookup
|
2019-04-10 18:21:38 -04:00 |
|
Pedro Beschorner Marin
|
5f011f2e2e
|
Included unmuteViewers param on create
|
2019-04-10 17:55:24 -03:00 |
|
Pedro Beschorner Marin
|
141170e695
|
Refactoring lockSettingsProps
|
2019-04-10 10:44:34 -03:00 |
|
Pedro Beschorner Marin
|
3f2cb781d7
|
Adjusted lockSettingsProps for the HTML5 client
|
2019-04-10 13:04:27 +00:00 |
|
Vitor Mateus
|
5cc41dd728
|
Fix console warning
|
2019-04-09 14:55:10 -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 |
|
Vitor Mateus
|
1d41ce65c3
|
code cleanups
|
2019-04-05 15:33:09 -03:00 |
|
Vitor Mateus
|
32067f2f7a
|
Fixes and improvements
|
2019-04-05 15:10:05 -03:00 |
|
Vitor Mateus
|
7d5e47666c
|
Fix End Meeting errors #7021
|
2019-03-19 17:06:13 -03:00 |
|
Anton Georgiev
|
5fe8d6a2c0
|
Merge pull request #6930 from Tainan404/issue-6919
Fix few breakout room bugs.
|
2019-03-14 13:05:54 -04:00 |
|
Tainan Felipe
|
eafd7f6673
|
Add user verification in 2 spots and Fiz join breakout opening into breakout
|
2019-03-14 13:45:20 -03:00 |
|
Anton Georgiev
|
31acde212f
|
reduce log noise for common benign events
|
2019-03-08 16:00:16 +00:00 |
|
Tainan Felipe
|
160c0669f8
|
Fix publishers access for moderators
|
2019-03-07 17:23:42 -03:00 |
|
Tainan Felipe
|
32f5168090
|
Fix viewer can view all breakout Rooms
|
2019-03-07 13:33:34 -03:00 |
|
Tainan Felipe
|
479839b0b6
|
Add publisher changes
|
2019-03-06 17:38:07 -03:00 |
|
Tainan Felipe
|
3d8501042a
|
Fix main meeting by viewing all server breakout rooms
|
2019-03-06 17:01:39 -03:00 |
|
bobakoftadeh
|
a9119a239e
|
Improve how target is added
|
2019-02-25 17:01:28 +00:00 |
|
bobakoftadeh
|
2c0d201345
|
Add target attribute
|
2019-02-22 22:08:44 +00:00 |
|
bobakoftadeh
|
4a66dab29f
|
Fix links in welcome message
|
2019-02-19 22:29:23 +00:00 |
|
Anton Georgiev
|
d0f2e8806e
|
Merge branch 'master' into sync-lock-settings-status
|
2019-02-08 13:13:58 -05:00 |
|
Tainan Felipe
|
742040c57b
|
Merge remote-tracking branch 'upstream/master' into issue-6450
|
2019-02-05 13:01:20 -02:00 |
|
Joao Siebel
|
555ee1232a
|
sync meeting lock settings status and handle GetLockSettingsRespMsg message. close #6669
|
2019-02-04 14:07:20 -02:00 |
|
Fred Dixon
|
566b245e3c
|
Merge pull request #6385 from pedrobmarin/keep-meeting-events
Created property keepEvents at bbb-web to make redis record the event…
|
2019-01-24 21:47:50 -05:00 |
|
Tainan Felipe
|
cfee36f8d7
|
Add time remaining notification bar status
|
2019-01-23 14:13:03 -02:00 |
|
Bobak Oftadeh
|
dd89bed5e8
|
Added checks to meetingId
|
2019-01-08 14:21:47 -08:00 |
|
Bobak Oftadeh
|
b41761350d
|
Improved checks for record time
|
2019-01-04 21:32:59 +00:00 |
|