BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,759 Commits 13 Branches 260 Tags 1.1 GiB
a8042a5b9e
Commit Graph

1316 Commits

Author SHA1 Message Date
Anton Georgiev
867edc695c
Merge pull request #12142 from ritzalam/do-not-log-chat-msgs 
Do not log chat msgs
 2021-04-26 15:06:05 -04:00
Richard Alam
ebf883d087 - add flag to not log the chat messages 2021-04-24 02:23:17 +00:00
Richard Alam
19c66dac6c - remove debug logs 2021-04-24 02:15:22 +00:00
Richard Alam
ba40af8324 - let parent meeting manage breakout lifecycle 2021-04-23 23:22:01 +00:00
Richard Alam
722fb707cc - fix issue https://github.com/bigbluebutton/bigbluebutton/issues/11358 by having the parent meeting 
tell the breakout rooms the remaining time. Currently, each room has its own countdown timer which
   could introduce drifting resulting in breakout rooms ending at different times.
 2021-04-23 21:25:06 +00:00
Richard Alam
b89fd1dbe2 - only update parent meeting if this is breakout room 2021-04-23 21:21:23 +00:00
Anton Georgiev
3ebb2cf46d
Merge pull request #12004 from prlanzarin/u23-isitcoldinthewater 
video: voice activity video sorting
 2021-04-20 09:47:43 -04:00
hiroshisuga
4db28a2824
Fancy random viewer selection (#11297) 
* Revert "Delete bbb-icons-ori.woff"

This reverts commit 84937a0d07.

* Revert "Add files via upload"

This reverts commit 391434445a.

* Revert "Delete bbb-icons.woff"

This reverts commit 7c245c666d.

* Revert "Add files via upload"

This reverts commit 6f8c764c4b.

* Revert "Delete tmp.woff"

This reverts commit 5141e65359.

* Revert "Add files via upload"

This reverts commit c8f7b17b04.

* Revert "Create tmp.woff"

This reverts commit 73c4506594.

* Revert "Delete bbb-icons.woff"

This reverts commit 9d01d58527.

* Revert "Revert "Delete bbb-icons.woff""

This reverts commit d221d290cd.

* Revert "Revert "Revert "Delete bbb-icons.woff"""

This reverts commit c415ff02d1.

* Revert "Revert "Delete bbb-icons.woff""

This reverts commit d221d290cd.

* Revert "Revert "Create tmp.woff""

This reverts commit 267dc412d5.

* Revert "Delete bbb-icons-ori.woff"

This reverts commit 84937a0d07.

* Revert "Delete bbb-icons.woff"

This reverts commit 7c245c666d.

* Revert "Add files via upload"

This reverts commit 6f8c764c4b.

* Revert "Add files via upload"

This reverts commit c8f7b17b04.

* Revert "Create tmp.woff"

This reverts commit 73c4506594.

* Revert "Delete bbb-icons.woff"

This reverts commit 9d01d58527.

* Revert "Revert "Delete bbb-icons.woff""

This reverts commit 64a48f2bd6.

* Revert "Revert "Revert "Delete bbb-icons.woff"""

This reverts commit 9d1b4a068a.

* Revert "Revert "Revert "Revert "Delete bbb-icons.woff""""

This reverts commit b60491d933.

* Revert "Revert "Revert "Revert "Revert "Delete bbb-icons.woff"""""

This reverts commit 16e357091d.

* Revert "Revert "Revert "Revert "Revert "Revert "Delete bbb-icons.woff""""""

This reverts commit e0b70f2055.

* Revert "Revert "Revert "Revert "Revert "Revert "Revert "Delete bbb-icons.woff"""""""

This reverts commit 7b1bde97ed.

* Update UsersMgs.scala

* Update selectRandomViewer.js

* Update clearRandomlySelectedUser.js

* Update addMeeting.js

* Update updateRandomViewer.js

* Update component.jsx

* Update container.jsx

* Update component.jsx

* Update container.jsx

* Update styles.scss

* Update en.json

* Update SelectRandomViewerReqMsgHdlr.scala

* code simplification

* in case only one person to be selected

* Update en.json

* Create en.json

* Update en.json

* Update component.jsx

* Update styles.scss

* Update en.json

* Update updateRandomViewer.js

Fix a typo

* Update component.jsx

When the presenter is moved to a viewer, in the modal of ex-presenter "somebody is selected" should be displayed. Before this modification, "somebody is the only viewer" was displayed.

* add a comment

explaining why a condition is needed.

* Update en.json

* Update en.json

* revert (due to the rename UserMgs -> UserMsgs)

* Update UsersMsgs.scala
 2021-04-15 11:12:10 -04:00
prlanzarin
172e31b78e Rework of the floor event 
Now it`s called AudioFloorChanged* to properly reflect its role

Add fields to carry the floor state (boolean) along with the uID and vID to be able to send events for a floor takeover and a floor surrender
 2021-04-12 18:25:58 +00:00
Aron Engineer
182340112a feat: Meeting id query param added, support for get and getall added 2021-04-09 18:47:01 +00:00
Gustavo Trott
b7d61e45eb Reorganize code 2021-04-08 16:53:22 -03:00
Gustavo Trott
3e675af3b5 Akka broadcasts UploadedFile Too Large error msg 2021-04-08 16:49:17 -03:00
Aron Engineer
e5903ccfdd feat:Meeting analytics web api endpoint added to expose meeting info 2021-04-08 19:19:22 +00:00
Gustavo Trott
3d1575e635 Send pubSub FileTooLarge Error Msg from bbb-web when file is too large, (and makes Akka send meetingId with presentation token msg) 2021-04-08 14:18:15 -03:00
Aron Engineer
35909a4cba fix: Null value replaced with other relevant placeholder values for analytics logging. 2021-04-05 20:55:55 +00:00
Aron Engineer
c7563765c6 fix: Analytics logging value Meeting Recorded corrected, common messages change 2021-04-05 18:43:39 +00:00
Aron Engineer
66b320c26a fix: extra lines removed from updateWebcamStream 2021-04-01 18:12:36 +00:00
Aron Engineer
2d740ec2a9 feat: CamStreamSubscribeSysMsg added with handler and update webcam functionality, ScreenStreamSubscribeSysMsg added 2021-04-01 17:35:09 +00:00
Aron Engineer
1a2af980cf fix: literal renamed for readability 2021-03-30 20:28:01 +00:00
Aron Engineer
21ad951f5f feat: TwoWay user params added to MeetingAnalyticsInfo message, Message body modified with correct ref naming 2021-03-30 20:08:41 +00:00
Anton Georgiev
cf6491adc8
Merge branch 'develop' into multiple-choice-poll 2021-03-30 12:49:35 -04:00
Aron Engineer
7c06f3b85e Merge branch 'develop' into analytics_actor_for_meeting_info 2021-03-29 19:50:03 +00:00
Aron Engineer
c3640f2971 fix:Banned user rejoining error code modified with error message 2021-03-29 17:22:55 +00:00
Anton Georgiev
aae72c0547
Merge branch 'develop' into multiple-choice-poll 2021-03-29 11:54:44 -04:00
Aron Engineer
7195a67e4e fix: MeetingInfoAnalyticsMessage WebcamStream modified 2021-03-26 20:29:27 +00:00
Aron Engineer
4c328e980a Merge branch 'develop' into analytics_actor_for_meeting_info 2021-03-24 20:32:22 +00:00
Aron Engineer
fe898bc276 WIP: Meeting actor modified to separate individual params 2021-03-24 20:30:01 +00:00
Aron Engineer
105e1d0166 fix: Option removed from ValidateAuthTokenRespMsg and respective handlers, default eject reason added 2021-03-24 17:42:19 +00:00
Aron Engineer
376dfcc59a Merge branch 'develop' into logout_response_message_modified_reasoncode 2021-03-24 13:15:45 +00:00
Aron Engineer
52d57645c4 fix: ValidateAuthTokenRespMsg reason code added to the message. 2021-03-23 21:13:14 +00:00
Pedro Beschorner Marin
0c4cf0135d Handle pad's events and Meteor's instances 
Since Meteor was split in multiple process and events started to be
filtered by instances, all Etherpad's Redis events were being discarded.

Etherpad has a Redis' publisher plugin that is unaware of BigBlueButton's
existence. All the communication between them is kept simple with minimal
of internal data exchange. The concept of distincts subscribers at Meteor's
side broke part of this simplicity and, now, Etherpad has to know which
instance must receive it's messages. To provide such information I decided
to include Meteor's instance as part of the pad's id. Should look like:

 - [instanceId]padId for the shared notes
 - [instanceId]padId_cc_(locale) for the closed captions

With those changes the pad id generation made at the recording scripts had to
be re-done because there is no instance id available. Pad id is now recorded at
akka-apps and queried while archiving the shared notes.
 2021-03-23 18:03:50 -03:00
Aron Engineer
6d100d2a21 WIP: New params added to MeetingInfoAnalyticsLogMessage 2021-03-23 20:13:40 +00:00
Aron Engineer
f0b7aea734 Merge branch 'develop' into analytics_actor_for_meeting_info 2021-03-23 13:06:15 +00:00
Aron Engineer
f598862149 feat: Presenter added to presentationInfo analytics message 2021-03-19 19:25:08 +00:00
Aron Engineer
af528b26d1 feat: WIP meeting info analytics logging messages computed 2021-03-18 21:43:49 +00:00
Anton Georgiev
b1bbc3fd52
Merge branch 'develop' into multiple-choice-poll 2021-03-17 16:11:49 -04:00
Pedro Beschorner Marin
d90ba5e286 Merge branch '2.3-per-user-wb' into develop 2021-03-16 20:28:39 -03:00
Pedro Beschorner Marin
381c5cb15c Isolated whiteboard access 
Modified the previous implementation of the whiteboard individual access to remove
multiple Collections dependency on this feature. Multi-user whiteboard is now an
array instead of a boolean value and most of the access control can be synchronized
and handled by akka-apps.
 2021-03-16 19:55:25 -03:00
Michael Z
4d3bda1306
Merge branch 'develop' into multiple-choice-poll 2021-03-16 18:38:48 +01:00
Aron Engineer
eb601eef3e fix: create meeting message order precedes group chat message in akka-apps 2021-03-15 22:34:54 +00:00
Michael Zinsmeister
b99bd3be0c Merged upstream develop branch 2021-03-14 22:17:19 +01:00
Anton Georgiev
9f841bd64b
Merge pull request #11622 from prlanzarin/u23-ilgiardino 
[screenshare] Rewrite SFU/Kurento screensharing bridge (+reconnections|audio sharing|QoL, was #11025)
 2021-03-12 05:13:11 -05:00
prlanzarin
7eb91f9273 Merge branch 'u22-screenshare18102020' of https://github.com/prlanzarin/bigbluebutton-1 into u23-ilgiardino 2021-03-11 18:49:14 +00:00
Aron Engineer
625c4962a0 feat: ValidateAuthToken revoked when user is logged out, reason added to response message 2021-03-11 14:32:01 +00:00
Aron Engineer
56a2ff5df8 feat: User modified to add logged out attribute 2021-03-11 14:32:01 +00:00
Pedro Beschorner Marin
0365018e92 Add guest lobby messages 
Moderators are able to send a message to the meeting's guest lobby. This new
event reaches bbb-web and is sent to the guest user with her/his status response
while polling. All guest users that are waiting for acceptance will be able to
read this message.

enableGuestLobbyMessage is disabled by default.
 2021-03-09 11:02:25 -03:00
Michael Zinsmeister
6ac09c25cf change back application.conf 2021-03-07 15:32:52 +01:00
Michael Zinsmeister
81d5129084 Merge with upstream 2021-03-07 15:28:39 +01:00
Michael Zinsmeister
214b236701 Merge with upstream 2021-03-07 15:12:49 +01:00
Richard Alam
28245a1b58
Merge pull request #11557 from aron-2809/bbb-core-http-endpoint-wip 
Bbb core http endpoint wip
 2021-03-05 14:27:48 -05:00
Aron Engineer
2c8220a897 fix: HealthActor messages optimized for the timestamp value update 2021-03-05 18:31:31 +00:00
Aron Engineer
284ba1af97 fix: Timeout exception response modified with typesafety. 2021-03-05 17:23:51 +00:00
Anton Georgiev
228bad03d5 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into march4-merge 2021-03-04 21:25:47 +00:00
Aron Engineer
cae124aed7 feat: pubsub send and receive statuses added to health endpoint 2021-03-04 21:16:48 +00:00
Aron Engineer
391ce4d83d feat: BasicStatusCheck added for redis db, computation added to HeathActor 2021-03-02 20:49:02 +00:00
Anton Georgiev
abf9ed4063
Merge pull request #11538 from prlanzarin/u22-track1006022021 
Improve permission checks for video, screen sharing and listen only
 2021-03-02 15:46:33 -05:00
Anton Georgiev
eba2d0ab58
Merge pull request #11535 from pedrobmarin/etherpad-patch 
Rework padIds and turn bbb-web pad aware
 2021-03-02 14:48:34 -05:00
Anton Georgiev
879c54981e
Merge pull request #11447 from antobinary/external-video-sync-lucas-amguirado73 
External video events propagated through akka-apps
 2021-03-02 08:53:09 -05:00
Anton Georgiev
550bf6d282
Merge pull request #11525 from gustavotrott/develop 
Adds lastAuthTokenValidatedOn to users
 2021-03-01 13:56:16 -05:00
Anton Georgiev
d20479d7c4
Merge pull request #11493 from aron-2809/bbb-core-http-endpoint-wip 
WIP: Http endpoint added for health check
 2021-02-26 12:44:04 -05:00
Pedro Beschorner Marin
540ce10c24 Recording external video events 2021-02-26 00:59:40 +00:00
Anton Georgiev
aff272cbf3 Merge #7484 into #11447 ExternalVideo recording events 2021-02-25 19:54:22 +00:00
Gustavo Trott
63e00bd7ca Adds lastAuthTokenValidatedOn to users in Akka, send it in ValidateAuthTokenRespMsg pubSub msg, makes Meteor store it as authTokenValidatedTime 2021-02-25 16:52:20 -03:00
Aron Engineer
135f80ba71 WIP: Http endpoint added for health check 2021-02-24 21:23:07 +00:00
Anton Georgiev
af7e158244 Set falllback value of voiceConf.ejectRogueVoiceUsers to true 2021-02-24 13:12:02 -05:00
Anton Georgiev
b8eaf47263
Merge pull request #11454 from schrd/akka-config 
Akka config
 2021-02-23 08:44:00 -05:00
Anton Georgiev
0b6496618c Merge branch 'develop' of github.com:amguirado73/bigbluebutton into external-video-sync-lucas 2021-02-21 11:04:39 +00:00
Daniel Schreiber
5d620e7acd let bbb-apps-akka read an override config file from /etc/bigbluebutton 
This change introduces a config file
`/etc/bigbluebutton/bbb-apps-akka.conf` which reads the default config
from packages and allows operators to keep their own config file changes
across package upgrades. This removes the workaround of copying the
config file to /tmp in preinst and then extracvting API URI and secret
and then in postinst inject it back to the config file in /usr/share

If the config file in /usr does not have the "changeme" secret, then API
URI and secret are extracted and injected to the generated file /etc, so
packages would upgrade in a clean way.

The postrm script removes the config file in /etc if the package is
purged but not if it is just uninstalled.

bbb-install and bbb-conf must reflect this change and replace the API
secret and URL in /etc, not /usr/share
 2021-02-19 13:55:36 +01:00
Anton Georgiev
55e8de4357 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into feb18-merge 2021-02-18 20:33:19 +00:00
Anton Georgiev
e966d6c7b6
Merge pull request #11366 from MaximKhlobystov/updating-poll-ui 
Updated poll UI: question field and typed responses
 2021-02-18 10:32:33 -05:00
Anton Georgiev
49cdf9faef
Merge pull request #11413 from gustavotrott/develop 
Include registeredOn date in pubSub user creation messages to replace loginTime creation in Meteor
 2021-02-17 16:56:53 -05:00
Gustavo Trott
573bfc107b Remove changes not related to issue 2021-02-17 09:39:36 -03:00
Gustavo Trott
91f4eba678 Replace registeredOn params to Long (timestamp) instead of String (ISO_OFFSET_DATE_TIME) 2021-02-17 09:20:55 -03:00
prlanzarin
866c771792 akka-apps: make ejectRogueVoiceUsers true by default 2021-02-17 08:54:47 -03:00
Anton Georgiev
b2c4244276 Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into 2.3-alpha5-with-split-meteor-roles-10349 2021-02-16 19:55:10 +00:00
Gustavo Trott
129a4e4f33 Remove changes not related with registeredOn issue 2021-02-16 15:40:56 -03:00
Gustavo Trott
12e363eb92 Removes loginTime creation from Meteor and use the registeredOn date created on Akka. Makes Akka send the registeredOn date throught PubSub messages: UserRegisteredRespMsg, GuestsWaitingForApprovalEvtMsg and ValidateAuthTokenRespMsg. 2021-02-16 14:46:30 -03:00
Anton Georgiev
f43560d535 Support for backend vs frontend nodejs instances bbb-html5 2021-02-16 03:19:31 +00:00
prlanzarin
8f233b74ee akka-apps: handle dial-in users in voice user ejection 2021-02-12 17:16:32 -03:00
Richard Alam
04a05f0bbe
Merge pull request #11390 from aron-2809/fix-userId-EndMeeting 
fix inserts userId to the EndMeeting function calls.
 2021-02-12 14:58:52 -05:00
prlanzarin
703505c486 akka-apps: extend SysConf in VoiceApp 
To be used with the ejectRogueVoiceUsers config option
 2021-02-12 16:01:44 -03:00
Pedro Beschorner Marin
ba9528ebb1 Option to eject voice users with no matching user 
Reconnects may introduce ghost voice users in a meeting when the client fails to
rejoin but the audio connection remains active.

While fetching for the voice conference user's status, apps can now check if a
voice user has a matching user record. If it doesn't, eject the voice user.
 2021-02-12 15:29:56 -03:00
Aron Engineer
1d8c51e9cf fix inserts userId to the EndMeeting function calls. 2021-02-12 17:45:08 +00:00
prlanzarin
1290838b16 akka-apps: cleanup on the camera/listen/screen permission calls 2021-02-11 19:45:59 -03:00
Richard Alam
71eb8cc664
Merge pull request #11383 from aron-2809/fix-issue-11182 
User role is incorrect after client reconnect.
 2021-02-11 14:53:55 -05:00
Aron Engineer
a49789d50a User role is incorrect after client reconnect. 
fix for issue: https://github.com/bigbluebutton/bigbluebutton/issues/11182
 2021-02-11 18:57:58 +00:00
Anton Georgiev
2061e0ddd2
Merge pull request #11164 from BrentBaccala/preserve-bbb-web-settings 
preserve bbbWebAPI and sharedSecret over upgrades
 2021-02-11 12:50:42 -05:00
Fred Dixon
54ae154759
Merge pull request #11380 from schrd/akka-systemd 
Customize systemd unit files
 2021-02-11 07:36:19 -04:00
Daniel Schreiber
b6777ed9cb Customize Systemd unit files 
Currently there is a mechanism in bbb-config which adds overlay units.
This is not neccesary because sbt allows you to specify your own unit
files.
 2021-02-11 11:16:55 +01:00
prlanzarin
765686714b akka-apps, video: add camera broadcast and subscribe permission check messages 
Used by bbb-webrtc-sfu to enrich its validation on whether a user is allowed to broadcast or subscribe to a camera stream
 2021-02-10 21:55:46 -03:00
prlanzarin
93aa556aba akka-apps, screenshare: add broadcast and subscribe permission check messages 
Used by bbb-webrtc-sfu to enrich its validation on whether a user is allowed to broadcast a screen or subscribe to one
 2021-02-10 19:02:19 -03:00
prlanzarin
c226d9544e akka-apps: add global audio permission check messages 
Used by bbb-webrtc-sfu to enrich its validation on whether a user is allowed to subscribe to the global audio bridge via listen only or not
 2021-02-10 15:00:04 -03:00
Pedro Beschorner Marin
09b39a8d63 Add extra pad validation 
Associate pads with meetings so session validation is restricted to the
meeting's valid session tokens.

Meteor will dispatch new redis events on shared notes and closed captions
pads creation. This event will go through apps and reach web to populate
a new meeting's pad collection that contains all valid pad id's for that
session. Nginx will use this collection to check if the user's session token
belongs to the pad's authorized users.

Besides these modifications, an extra change will be needed at notes.nginx.
Location /pad/p/ needs to change it's auth_request:

from /bigbluebutton/connection/checkAuthorization;
to /bigbluebutton/connection/validatePad;
 2021-02-10 13:37:04 -03:00
Michael Zinsmeister
129681c0d5 Merge remote-tracking branch 'origin/multiple-choice-poll' into multiple-choice-poll 2021-02-09 14:40:50 +01:00
Michael Zinsmeister
f5831d7da7 Revert "backend mutiple choice - config files" 
This reverts commit 7a6c534f
 2021-02-09 14:38:49 +01:00
Maxim Khlobystov
480602a1a6 Using ArrayBuffer instead of Array when creating a new Question 2021-02-09 06:24:23 +00:00
Anton Georgiev
e2e0b78d40 Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into split-meteor-roles-on-top-of-2.3-alpha6 2021-02-08 23:39:42 +00:00
Maxim Khlobystov
ff4260dc98 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into updating-poll-ui 2021-02-08 21:41:43 +00:00
Simon Hirtreiter
70fc71cc70 Merge remote-tracking branch 'upstream/develop' into multiple-choice-poll 
# Conflicts:
#	bbb-common-message/src/main/scala/org/bigbluebutton/common2/domain/Meeting2x.scala
 2021-02-08 17:00:36 +01:00
Michael Zinsmeister
eaa6f0260c Fix poll results and add locale entries 2021-02-08 10:57:39 +01:00
Anton Georgiev
363c801338
Merge pull request #11215 from pedrobmarin/guest-draft 
Disable authenticated guests
 2021-02-05 16:13:46 -05:00
Anton Georgiev
8c0f0fdd52 Split Meteor roles backend-frontend revisit 2021-02-05 17:47:46 +00:00
hiroshisuga
0d63383c2a
Prevent presenter being selected by random viewer selection (#11275) 
Akka-apps filter presenter and moderators from random viewer selection list
 2021-02-04 20:26:04 -05:00
Michael Zinsmeister
7a6c534fef backend mutiple choice - config files 2021-02-04 16:13:21 +01:00
Michael Zinsmeister
462f963d08 backend mutiple choice 2021-02-04 16:13:07 +01:00
Anton Georgiev
09e6ba8dfd Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-Jan30 2021-01-29 20:58:05 +00:00
Pedro Beschorner Marin
7e26e78c4f Cleanup from authenticated guests removal 
While cherry-picking some of this work I noticed those extras.
 2021-01-23 22:22:52 -03:00
werk21
80af96ff76 9101: Survey: New profile yes/no/abstention 2021-01-24 02:22:40 +01:00
Pedro Beschorner Marin
19cbef1fd9 When authenticatedGuests is disabled, guests should be fit for promotion 2021-01-23 21:51:03 -03:00
Pedro Beschorner Marin
0bbef12ac7 Authenticated guests feature controlled at bbb-web properties 2021-01-23 21:48:02 -03:00
Anton Georgiev
45c1ff6e40
Merge pull request #11175 from MaximKhlobystov/select-random-user 
Presenter selecting a random viewer
 2021-01-22 15:31:00 -05:00
Brent Baccala
434b64ed88 packaging for bbb-web: preserve bbbWebAPI and sharedSecret over upgrades 
Trying to get to the point where upgrades can occur without having
to re-run bbb-conf
 2021-01-15 16:35:50 -05:00
hiroshisuga
7f5352e2f9
Update application.conf 2020-12-17 23:13:32 +09:00
Anton Georgiev
8b65f9e15b Set bbb-html5 loadbalancing to be round robin 2020-12-15 01:55:57 +00:00
Anton Georgiev
9239d515a5 dispatch whiteboard events to html5 redis channel only 2020-12-12 01:45:38 +00:00
Anton Georgiev
09ca742e01 cleanup 2020-12-11 23:46:01 +00:00
Anton Georgiev
0be8773e4c Loadbalance bbb-html5 in bbb-web based on CPU 2020-12-11 21:36:06 +00:00
germanocaumo
83fe68db08 Play screenshare audio when present 2020-12-08 20:30:22 +00:00
Anton Georgiev
3faabd1821 Merge 2.2.29 and 2.2.30 into 2.3.x 2020-11-24 15:13:09 +00:00
KDSBrowne
50f85ff2e2 make responders private | add accessors 2020-11-05 19:24:10 +00:00
KDSBrowne
2f46c1fd28 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-user-rand-select 2020-11-02 16:16:29 +00:00
KDSBrowne
d2cb02b3bd prevent users from being able to send more than 1 poll vote 2020-10-28 18:33:09 +00:00
Anton Georgiev
df8b6350c9
Merge pull request #10617 from KDSBrowne/2.3-undo-pencil 
Fix broken undo of consecutive pencil annotations
 2020-10-27 14:59:57 -04:00
KDSBrowne
73f890c9d8 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-updated-polling 2020-10-21 16:05:03 +00:00
Anton Georgiev
0c7ead1916 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into oct16-merge 2020-10-21 14:48:02 +00:00
KDSBrowne
d74b5af2a9 clear selected user when moderator closes modal | clean up 2020-10-19 14:46:41 +00:00
KDSBrowne
c518263fc9 fix broken undo of consecutive pencil annotations 2020-10-08 14:35:36 +00:00
hiroshisuga
ff47857c18
Update Bezier.java 2020-09-30 22:44:26 +09:00
hiroshisuga
a7c981d124
Update Bezier.java 2020-09-30 09:59:11 +09:00
hiroshisuga
e857d016e0
Update Bezier.java 2020-09-30 09:49:08 +09:00
KDSBrowne
3e8eebdd1b move random viewer selection to akka-apps 2020-09-25 19:41:30 +00:00
Pedro Beschorner Marin
a7e1623619 Option to prevent eject users by permission violation 
PermissionCheck verifies ejectOnViolation before eject an user
 2020-09-22 15:13:15 -03:00
KDSBrowne
d32155cc5f add new poll type | allow typed responses | update UI 2020-09-21 12:07:36 +00:00
Pedro Beschorner Marin
e2adf24546 Support for avatar images 
Use the former Flash client avatarURL join param to replace the name
initials avatar from the user list, chat, waiting guests and connection
status list.

It is possible to define a defaultAvatarURL at bbb-web and enable/disable it
 2020-09-15 16:50:10 -03:00
Anton Georgiev
14f464087f
Merge pull request #8417 from pedrobmarin/backend-cleanup 
Backend cleanup
 2020-08-28 15:37:00 -04: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
KDSBrowne
0fdd1dc978 allow start / stop of polls with no presentation 2020-07-20 14:34:46 +00:00
Anton Georgiev
3b843e7c56 Do not ban user who left while in waiting list. Adjusting after merging 2.2. into 2.3 in #9672 2020-05-26 13:55:38 +00:00
Anton Georgiev
c9e996de21 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop 2020-05-25 17:32:24 +00:00
Anton Georgiev
b6194f96cb Add log in akka-apps to show whether user was banned or simply ejected 2020-05-22 11:12:19 -04:00
Anton Georgiev
e7917994d5 add banUser field in EjectUserFromMeetingCmdMsgBody 2020-05-22 10:45:28 -04:00
Richard Alam
eb006d470b Ejected users due to permission check cannot rejoin meeting 
- users who are ejected from meeting because of permission check cannot
   rejoin meeting as we mark them as banned. Only users ejected by a
   moderator should be banned. Later on, we should make the moderator
   indicate if the ejected user should be bannd or not.

   see https://github.com/bigbluebutton/bigbluebutton/issues/9608
 2020-05-19 12:41:35 -07:00
basisbit
5ccba7b0fb
akka-bbb-apps only listen on localhost 
attack surface reduction by having akka-bbb-apps only listen on localhost
 2020-05-15 13:42:20 +02:00
Anton Georgiev
c3e1738314 Adjust #8499 for 58fed45754 
Tweaking `RegisteredUsers.remove(u.id, liveMeeting.registeredUsers)`
since we no longer have .remove on RegisteredUsers
 2020-05-06 16:27:47 +00:00
Anton Georgiev
cc79c4b6ae merge 2.2.10 into 2.3 2020-05-05 19:52:44 +00:00
Richard Alam
292f673f5e Do not send disconnect message 
Do not send disconnect message when validate token fails as meteor will disconnect the client itself.
 2020-04-28 19:29:21 -07:00
Richard Alam
309ac30899 - comment out debug printlns 2020-04-24 07:20:42 -07:00
Richard Alam
58fed45754 Do not ban users ejecting self from meeting 
Some users join with multiple browsers. When user is ejecting self from one browser,
 do not eject all sessions for that user and do not prevent them from rejoining.
 2020-04-24 07:14:50 -07:00
Richard Alam
cca49e4546 Keep track of banned dial-in callers 
When a dial-in caller is ejected from the meeting, keep track of the callerid number.
 When the same callerid number rejoins the conference, eject the caller.
 2020-04-23 19:12:16 -07:00
Richard Alam
c40f1727d3 Prevent ejected users from rejoining 
- track ejected user based on external userid. If user rejoins with the same external
   userid, fail the validate token.
 2020-04-21 19:26:09 -07:00