Gustavo Trott
e919e24b38
Auto assign breakout names and users using lastBreakout or groups
2021-11-11 10:10:31 -03:00
Anton Georgiev
019a0b25b9
Merge pull request #13564 from jfsiebel/remove-unused-property-chat-message
...
Remove unused properties from chat message event
2021-11-02 15:12:56 -04:00
Joao Siebel
7a118ed3b8
Remove unused properties from chat message event record. close #11696
2021-10-25 14:46:59 -03:00
Ramon Souza
c892a2a5d1
resolve conflicts
2021-09-21 12:06:27 -03:00
Ramon Souza
85ded998f2
remove linting
2021-09-17 11:03:09 -03:00
Ramon Souza
0ca1b7896e
Merge remote-tracking branch 'upstream/develop' into PR-11359
2021-09-17 09:12:43 -03:00
Gustavo Trott
cd15f17394
Refactor all references for activity-report renaming to learning-dashboard
2021-08-25 11:38:35 -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
Joao Siebel
8462465a5f
Allow default layout config in bbb-web. close #12668
2021-07-19 11:02:58 -03:00
Gustavo Trott
45d4c310c2
Merge branch 'develop' into activity-report
2021-07-13 11:12:45 -03:00
Gustavo Trott
5c602fd2b0
Merge branch 'develop' into breakoutrooms-set-name
2021-07-12 16:31:38 -03:00
Gustavo Trott
0417cbb03f
Adds Activity Dashboard initial version and generate activityReportAccessToken
2021-06-30 00:01:46 -03:00
Gustavo Trott
7d76ccac4c
Change default Activity-report directory
2021-06-24 16:37:15 -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
germanocaumo
1fb9870cf7
Apply suggestions from code review
...
Code style fixes and remove translations other than en to avoid conflicts with transifex.
Co-authored-by: Pedro Beschorner Marin <pedrobmarin@gmail.com>
2021-06-17 10:25:03 -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
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
fd2ef393ed
Code fixes in Breakoutroom extend time parts
2021-06-02 15:38:26 -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
Anton Georgiev
8868e84e9f
Merge pull request #12395 from gustavotrott/end-when-no-moderator
...
Implements endWhenNoModerator
2021-05-31 10:59:55 -04:00
germanocaumo
4d347be53b
refactor: use questionText instead of title for poll question
2021-05-27 21:04:15 +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
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
Michael Zinsmeister
5ca831ff86
Merged upstream develop branch
2021-05-01 16:59:20 +02:00
Richard Alam
5114ea7780
- remove unused import
2021-04-23 17:23:40 +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
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
c7563765c6
fix: Analytics logging value Meeting Recorded corrected, common messages change
2021-04-05 18:43:39 +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
21ad951f5f
feat: TwoWay user params added to MeetingAnalyticsInfo message, Message body modified with correct ref naming
2021-03-30 20:08:41 +00:00
Aron Engineer
7c06f3b85e
Merge branch 'develop' into analytics_actor_for_meeting_info
2021-03-29 19:50:03 +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
6cd0f01adb
fix: bbb-common-message updated with correct Msg body
2021-03-24 17:56:13 +00:00
Aron Engineer
c4b05e83e8
fix: UserMsgs.scala filename typo fixed
2021-03-24 13:33:25 +00:00
Aron Engineer
52d57645c4
fix: ValidateAuthTokenRespMsg reason code added to the message.
2021-03-23 21:13:14 +00: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 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
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
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
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
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
Anton Georgiev
0b6496618c
Merge branch 'develop' of github.com:amguirado73/bigbluebutton into external-video-sync-lucas
2021-02-21 11:04:39 +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
91f4eba678
Replace registeredOn params to Long (timestamp) instead of String (ISO_OFFSET_DATE_TIME)
2021-02-17 09:20:55 -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
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
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
Michael Zinsmeister
462f963d08
backend mutiple choice
2021-02-04 16:13:07 +01: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
hiroshisuga
ad40faaf66
Rename GoupChatMsg.scala to GroupChatMsg.scala
2021-01-09 09:01:51 +09: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
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
73f890c9d8
Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-updated-polling
2020-10-21 16:05:03 +00:00
KDSBrowne
c518263fc9
fix broken undo of consecutive pencil annotations
2020-10-08 14:35:36 +00:00
KDSBrowne
3e8eebdd1b
move random viewer selection to akka-apps
2020-09-25 19:41:30 +00: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
