Gustavo Trott
6970a0ab30
Merge branch 'develop' into learning-dashboard-improvements2
2021-08-30 15:23:04 -03:00
Anton Georgiev
4ecb24b4fa
Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-aug30
2021-08-30 18:11:16 +00:00
Gustavo Trott
cd15f17394
Refactor all references for activity-report renaming to learning-dashboard
2021-08-25 11:38:35 -03:00
Pedro Beschorner Marin
57e27bb4dc
fix(polling): stop current running poll
...
As far as I could understand, polls are tightly coupled with the meeting
main content area, or at least they were and we still have to deal with
this close relation between them. Not sure if it's something we'll keep
this way forever but, from my candid perspective, looks like this is already
diverging inside the poll model. Polls are indexed by presentation pages,
screenshare or even something called "public" that I'm not 100% what
actually means. My best guess is anything besides the first and the second.
The polling stop process lacks to inform which pollId is scoped at source
so it relies on akka-apps to discover based on the current state of other
apps. This looks like the major problem over this polling termination issue.
Made a few changes at the running poll getter fallback at the polling stop
process. Following the premise that there is only one running poll available,
we make sure to return a valid running poll (if there's one).
2021-08-24 18:56:01 -03:00
Gustavo Trott
465a4c41ec
Includes dialIn users to Learning Dashboard
2021-08-18 11:45:24 -03:00
Anton Georgiev
c22875a6d7
Merge pull request #12977 from gustavotrott/learning-dash-improvements
...
Learning Dashboard: Layout improvements
2021-08-12 14:28:45 -04:00
Gustavo Trott
1d961d9c00
Sort users by moderator/alphabetical order
2021-08-11 18:22:55 -03:00
Gustavo Trott
dc2611632a
Adds more details about used Emojis
2021-08-11 14:46:44 -03:00
Joao Siebel
13913a6111
Remove LEGACY option for valid layouts. close #12858
2021-08-10 09:50:13 -03:00
Gustavo Trott
fd4761374f
Improvements to set all endedOn/leftOn when meeting is ended
2021-08-04 16:25:22 -03:00
Gustavo Trott
8346f1d9cf
Avoid send activity message if it didnt have new activities
2021-08-02 11:50:11 -03:00
Gustavo Trott
42e32b7ba8
Include infos about meeting endedOn and fix problem where user leftOn was never set if meeting ends before they left
2021-08-02 11:16:08 -03:00
Gustavo Trott
184f89c152
Merge branch 'activity-report' of github.com:gustavotrott/bigbluebutton into activity-report
2021-07-23 14:06:34 -03:00
Gustavo Trott
2500d4f767
Removes from Json all start/stop talks info, and inform only the totalTime
2021-07-23 14:02:48 -03:00
Gustavo Trott
eea16c8268
Remove unnecessary codes
2021-07-23 10:47:03 -03:00
Gustavo Trott
284b97840e
Remove unnecessary codes
2021-07-23 10:43:28 -03:00
Gustavo Trott
0661712da1
Removes Json content from INFO LOG. To avoid too large logs.
2021-07-23 10:40:57 -03:00
Gustavo Trott
e4ef1582f2
Merge branch 'develop' into activity-report
2021-07-22 11:33:47 -03:00
Gustavo Trott
3c6155a73e
Creates config activityReportTracking to enable Activity Report
2021-07-22 11:09:44 -03:00
Anton Georgiev
1abedcc698
Merge pull request #12789 from jfsiebel/implement-default-layout-config
...
Allow default layout config in bbb-web
2021-07-21 16:11:08 -04:00
Gustavo Trott
b0f9835ffd
Merge branch 'develop' into activity-report
2021-07-21 14:20:27 -03:00
Gustavo Trott
21f90fc0e3
Handle anonymous Polls to hide the autor of the answer
2021-07-21 14:16:27 -03:00
Gustavo Trott
c1e39819fe
Fix: Stop last user Talk when Audio is disabled or muted
2021-07-20 17:39:36 -03:00
Anton Georgiev
064f525f68
Merge pull request #12646 from jfsiebel/wip-prevent-unasign-assign-spam
...
WIP Prevent spam of assign presenter role
2021-07-20 16:02:52 -04:00
Joao Siebel
8462465a5f
Allow default layout config in bbb-web. close #12668
2021-07-19 11:02:58 -03:00
Gustavo Trott
d0b08f5603
Improvements in screenShare registers
2021-07-16 16:53:47 -03:00
Gustavo Trott
45d4c310c2
Merge branch 'develop' into activity-report
2021-07-13 11:12:45 -03:00
Gustavo Trott
974c8e1945
Adds Screenshare activities
2021-07-13 11:03:52 -03:00
Gustavo Trott
5c602fd2b0
Merge branch 'develop' into breakoutrooms-set-name
2021-07-12 16:31:38 -03:00
Anton Georgiev
b9cc633286
Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.3.5-into-develop
2021-07-06 19:36:19 +00:00
Gustavo Trott
0417cbb03f
Adds Activity Dashboard initial version and generate activityReportAccessToken
2021-06-30 00:01:46 -03:00
Joao Siebel
fc56678f71
Remove unused import
2021-06-28 10:43:10 -03:00
Gustavo Trott
de9896d8c5
Akka sends pubSub ActivityReportEvtMsg and Bbb-web listen and export the content as Json file
2021-06-24 16:22:27 -03:00
Joao Siebel
95e9cd3ef1
Add role check to allow webcamsOnlyForModerator changes. close #12636
2021-06-23 15:28:37 -03:00
Gustavo Trott
54dfe4bc3e
ActivityTracker handle/stores more important events
2021-06-23 11:51:10 -03:00
Joao Siebel
1d7bab7e0b
Prevent unnecessary call to unassign presenter and add logs
2021-06-22 14:44:34 -03:00
germanocaumo
349af23f0a
Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into anonymous-polls
2021-06-16 21:54:28 +00:00
Anton Georgiev
5ee5ed1970
Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-june16
2021-06-16 19:54:28 +00:00
germanocaumo
31138d440e
fix(poll): readd userId for non secret poll record event
2021-06-16 17:01:56 +00:00
Gustavo Trott
37dea2215b
Translates dynamically breakout room Names when default name is being used
2021-06-14 16:59:27 -03:00
Richard Alam
b6e49e5218
Merge branch 'develop' into paultrudel-analytics-actor-for-meeting-info
2021-06-12 01:29:28 +00:00
Richard Alam
ef766217f7
Merge branch 'analytics-actor-for-meeting-info' of https://github.com/paultrudel/bigbluebutton into paultrudel-analytics-actor-for-meeting-info
2021-06-12 01:28:37 +00:00
Anton Georgiev
1369cb2269
Merge pull request #12505 from gustavotrott/breakoutroom-inscrease-time
...
Add 'Extend duration' option for breakout rooms
2021-06-11 16:33:15 -04:00
germanocaumo
7bedcb08e5
fix(poll): don't translate user/presenter typed answers
...
When the answer is not default (Custom or UserResponse), don't translate the answers.
2021-06-11 16:55:53 +00:00
paultrudel
90fd6f4d2f
analytics endpoint now successfully returns meeting info
2021-06-11 09:31:51 -04:00
Gustavo Trott
c33f2f48ef
Add Actor to receive and store user activities
2021-06-09 10:00:18 -03:00
Gustavo Trott
5b579d3a16
Avoid extend breakout rooms time exceed parent meeting remaining time
2021-06-07 14:19:20 -03:00
tibroc
8f80f95251
removed userId and added secretPoll flag to RecordEvents
2021-06-07 11:01:34 +02:00
tibroc
1f329a70e3
pass secret polls also to handlers and object models
2021-06-07 10:57:53 +02:00
tibroc
828cf60cb2
Add option to hide individual answers in polls
...
This patch adds a new option to hide the individual answers to the presenter
when starting a poll. This includes hiding the answers for the presenter and
informing the other users that the current poll is anonymous.
See #9524
2021-06-07 10:56:14 +02:00
Gustavo Trott
02ef1186be
Avoid set negative values in Extend time for breakout rooms
2021-06-02 17:36:43 -03:00
Gustavo Trott
a312557461
Adds extend breakout room time functionality
2021-06-02 15:29:40 -03:00
Pedro Beschorner Marin
d4888f585c
refactor(external videos): state as integer
...
A media state may have more than 2 states. Moving this property back to
integer so it can be extended.
2021-06-02 15:07:03 -03:00
Pedro Beschorner Marin
4a5b92445a
refactor(external videos): system stop
...
Move all external video's system stop control events to akka-apps:
- on presenter change
- on presenter leave
- on screenshare start
2021-06-02 15:06:17 -03:00
Arthur B. Grossi
b0f2297809
refactor(external videos): add akka-apps model
2021-06-02 13:06:41 -03:00
Arthur B. Grossi
e606df6031
feat(external video): permission check
...
Checks permission of start, stop and update external video messages
and only broadcast it if the sender is presenter (unless it's system
messages).
2021-06-02 12:54:37 -03:00
Anton Georgiev
93c9aecab8
Merge pull request #12447 from gustavotrott/fix-user-inactive-while-in-breakoutroom
...
fix: Avoid users to be ejected due to inactivity while they are in a breakout room
2021-05-31 11:00:15 -04:00
Anton Georgiev
8868e84e9f
Merge pull request #12395 from gustavotrott/end-when-no-moderator
...
Implements endWhenNoModerator
2021-05-31 10:59:55 -04:00
Anton Georgiev
9f84b993f7
Merge pull request #12467 from pedrobmarin/f-r-mow
...
fix!(recording): moderator only webcams
2021-05-31 10:49:17 -04:00
Anton Georgiev
2b4746fc85
Merge pull request #12465 from pedrobmarin/f-r-rrce
...
feat(recording): record role change event
2021-05-31 10:47:15 -04:00
Pedro Beschorner Marin
0e34d7239d
fix!(recording): moderator only webcams
...
BREAKING CHANGE: fix typo at moderator only webcams recorded event.
2021-05-30 14:13:39 -03:00
Pedro Beschorner Marin
ed64e330ee
feat(recording): record role change event
...
Reuse `ParticipantStatusChangeEvent` record event, already used by emojis and
webcam streams, to record `UserRoleChangedEvtMsg`.
Role change is stored at `events.xml` as:
- promotion
```
<event timestamp="2068340" module="PARTICIPANT" eventname="ParticipantStatusChangeEvent">
<timestampUTC>1622384175759</timestampUTC>
<date>2021-05-30T14:16:15.759Z</date>
<status>role</status>
<userId>w_fowyht7g0tfi</userId>
<value>MODERATOR</value>
</event>
```
- demotion
```
<event timestamp="2071437" module="PARTICIPANT" eventname="ParticipantStatusChangeEvent">
<timestampUTC>1622384178855</timestampUTC>
<date>2021-05-30T14:16:18.855Z</date>
<status>role</status>
<userId>w_fowyht7g0tfi</userId>
<value>VIEWER</value>
</event>
```
2021-05-30 11:19:30 -03:00
germanocaumo
ed6e895b67
refactor: rename inside question parameters
2021-05-27 21:11:50 +00:00
germanocaumo
4d347be53b
refactor: use questionText instead of title for poll question
2021-05-27 21:04:15 +00:00
Gustavo Trott
b3f1d51f44
Updates user lastActivityTime in parent room while user is in breakout room
2021-05-26 17:16:15 -03:00
germanocaumo
674d23105e
fix: don't show empty line when poll have 7 answers
2021-05-20 18:39:33 +00:00
Gustavo Trott
979b21c0ed
Improve code reading
2021-05-17 18:13:00 -03:00
Gustavo Trott
00240c925e
Implements endWhenNoModerator
2021-05-17 17:52:59 -03:00
Anton Georgiev
1bc324b657
Merge pull request #12353 from germanocaumo/poll-record-improvs
...
Recorded polling events improvements
2021-05-13 13:43:36 -04:00
germanocaumo
ca2ad30e12
fix(record): add missing info to polling events
...
Add PollPublishedRecordEvent with all infos (also fix duplicated handlePollStoppedEvtMsg)
Add answer text to UserRespondedToPollRecordEvent (useful for custom answers)
Add type in PollStartedRecordEvent
2021-05-11 18:37:23 +00:00
germanocaumo
af6180a618
fix(record): add question title in pollstartedrecordevent
2021-05-11 18:36:42 +00:00
Gustavo Trott
62b24b8c19
Code improvements in inactivity warning funcs
2021-05-11 10:01:35 -03:00
Gustavo Trott
17994bb4dd
Fix problem that users was not being ejected after inactivity warning timeout
2021-05-10 15:12:13 -03:00
Michael Zinsmeister
5ca831ff86
Merged upstream develop branch
2021-05-01 16:59:20 +02:00
Richard Alam
22d434416a
- lump other responses in the poll and include in the display
2021-04-29 14:44:18 +00:00
Richard Alam
39c69675a4
- sort answers based on number of votes
...
- limit display of responses to 7 to prevent squishing of display in the whiteboard
2021-04-28 21:34:21 +00:00
Richard Alam
414716d23b
- remote debug logs
2021-04-28 21:33:34 +00:00
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 84937a0d07391434445a7c245c666d6f8c764c4b5141e65359c8f7b17b0473c45065949d01d58527d221d290cdc415ff02d1d221d290cd267dc412d584937a0d077c245c666d6f8c764c4bc8f7b17b0473c45065949d01d5852764a48f2bd69d1b4a068ab60491d93316e357091de0b70f20557b1bde97ed
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
Anton Georgiev
ef337acbe6
Merge pull request #11956 from gustavotrott/upload-maxsize-error
...
Creates a pubSub error message when Upload max size exceeded
2021-04-09 16:41:22 -04: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
d4ed29b49d
Merge branch 'develop' into analytics_actor_for_meeting_info
2021-04-06 12:52:36 +00: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
Marcel Waldvogel
9140613a96
Services run as starting PID
...
The starting scripts now `exec` the main service instead of starting
it as a subprocess. Also in line with docker-entrypoint recommendations.
2021-04-05 12:24:29 +02: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
Chad Pilkey
40b18b0662
whiteboard performance improvements
2020-04-08 20:03:56 +00:00
Anton Georgiev
1299abdf2c
Revert "Merge pull request #8782 from ritzalam/generate-meeting-data"
...
This reverts commit 37ed2c75015af41dabb4
2020-03-25 16:13:01 -04:00
Richard Alam
3cddd8a1c5
- dump out some meeting stats data into the log
2020-03-14 11:54:45 -07:00
Anton Georgiev
8129468300
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merging
2020-03-04 23:36:21 +00:00
Richard Alam
f8437fb19d
Merge branch 'v2.2.x-release' of https://github.com/bigbluebutton/bigbluebutton into pres-url-on-page-convert
2020-03-01 05:38:04 -08:00
Richard Alam
d879710503
- minimize logs
2020-02-28 13:12:53 -08:00
Ghazi Triki
64d08d69c7
Updated java projects dependencies versions.
2020-02-28 10:44:28 +01:00
Richard Alam
bba17c3a03
- handle pages on page converted messages instead on conversion completed message
2020-02-24 15:00:20 -08:00
Richard Alam
2fbd2821f4
- fix to display slodes
2020-02-20 12:43:23 -08:00
Richard Alam
7099df132d
- handle new messages in akka apps
2020-02-19 15:04:19 -08:00
Richard Alam
db4dc4aff0
- add urls on presentation page conversion message
2020-02-18 14:03:08 -08:00
Anton Georgiev
4b0452d1fd
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into feb14-merge-2.2-into-master
2020-02-14 21:43:35 +00:00
Richard Alam
7911d2b874
- client session wasn't set properly
2020-02-06 07:36:42 -08:00
Richard Alam
5af6374265
Track call session state
...
Currently, we user DTMF to inform the client when the call session is in echo test and when entering the voice conference.
Unfortunately, sometimes when FS sends the DTMF, FS crashes.
Monitor the progress of the call session using ESL events and propagate to the client.
The client would be informed of these call states: CALL_STARTED, IN_ECHO_TEST, IN_CONFERENCE, CALL_ENDED.
2020-02-05 14:58:47 -08:00
Pedro Beschorner Marin
397041efcc
Removes waiting guests that stop polling for their status
2020-01-15 12:03:52 -03:00
Anton Georgiev
866f359b0e
Add handling route for GetRunningMeetingsReqMsg
2020-01-09 15:59:48 +00:00
Pedro Beschorner Marin
13060aef26
Moving CheckRunningAndRecordingVoiceConfEvtMsg outside the messages that affect inactivity handler
2019-12-12 17:46:11 -03:00
Pedro Beschorner Marin
690d34029d
Remove Flash shared notes backend
2019-12-11 17:40:56 -03:00
Pedro Beschorner Marin
b11113c165
Remove meeting inactivity monitor
2019-12-11 17:11:57 -03:00
Anton Georgiev
56b1b12431
Merge branch 'master' into v2.2.x-release
2019-12-10 11:07:23 -05:00
