Anton Georgiev
3ce6dbf997
Merge pull request #14665 from JoVictorNunes/breakout-update
...
feat: move users among breakouts
2022-04-14 08:22:49 -04:00
Lucas Zawacki
83847a21aa
Merge branch 'v2.5.x-release-Layouts' of github.com:lfzawacki/bigbluebutton into develop-bbb
2022-04-13 21:08:32 +00:00
Anton Georgiev
aaef76cd2e
Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into merge-25-dev
2022-04-13 20:58:02 +00:00
Gustavo Trott
ecbfee26db
Missing parts
2022-04-12 13:56:54 -03:00
Joao Victor
0e29c1fdc3
Fix link sanitizing in welcome message.
2022-04-04 17:34:16 -03:00
Ramon Souza
06da4e5e0d
fix errors caused by develop merge
2022-04-04 16:52:43 -03:00
Ramon Souza
4c328bc4ea
Merge remote-tracking branch 'upstream/develop' into issue-14382
2022-04-04 16:25:50 -03:00
Ramon Souza
b9a76feb18
use Meteor Random.id() for id generation
2022-03-31 11:43:58 -03:00
Ramon Souza
6874156190
add messageDescription in notifications
2022-03-30 11:01:12 -03:00
Ramon Souza
41778cb959
filter all messages by meetingId
2022-03-30 10:15:47 -03:00
Ramon Souza
4da4b8d7a9
Merge remote-tracking branch 'upstream/develop' into pr-issue-14493
2022-03-29 17:27:20 -03:00
Ramon Souza
68f55b8c7b
Merge remote-tracking branch 'upstream/develop' into issue-14382
2022-03-25 09:21:15 -03:00
Lucas Zawacki
21703d9662
fix(layout): Fix propagation of layout type, simplify code
2022-03-22 19:13:52 +00:00
Gustavo Trott
a6c3af7b0f
Add disabledFeatures=virtualBackgrounds
2022-03-22 16:01:27 -03:00
Arthurk12
eacce4ee46
fix(layout): camera resize when pushing
...
Adds isResizing property to LayoutMeetings collection.
Moves the point where the last camera dock size is stored from webcam
component to custom layout component, since it is the only one with
this feature.
2022-03-22 15:29:49 -03:00
Gustavo Trott
4cb563085f
Implements param lockSettingsHideViewersCursor
2022-03-21 15:25:41 -03:00
Ramon Souza
a89e9da4ea
Merge remote-tracking branch 'upstream/develop' into issue-14382
2022-03-16 16:53:17 -03:00
Anton Georgiev
0d1d45245c
Merge pull request #14570 from gustavotrott/disabledFeatures-notes
...
feat: Support to disable shared notes and captions via disabledFeatures
2022-03-16 11:45:52 -04:00
Gustavo Trott
5fdacf93dd
Merge remote-tracking branch 'upstream/v2.5.x-release' into disabledFeatures-breakoutRooms
2022-03-14 15:33:04 -03:00
Gustavo Trott
adc1c8cef8
Implements disabledFeatures=breakoutRooms
2022-03-14 15:30:41 -03:00
Ramón Souza
35ae2a9e77
record notify modal
2022-03-11 20:26:26 +00:00
Tainan Felipe
fbb0f23510
Merge branch 'v2.5.x-release' into wip-notifications
2022-03-10 16:42:43 -03:00
Tainan Felipe
8858878d0d
Add server side notification
2022-03-10 16:33:25 -03:00
Gustavo Trott
9f939513b0
Implements disabledFeatures=captions
2022-03-10 15:02:20 -03:00
Pedro Beschorner Marin
5cd2b0b635
Merge remote-tracking branch 'bigbluebutton/v2.5.x-release' into f-v-amccc
2022-03-10 12:25:17 -03:00
Gustavo Trott
537704ef0e
Implements disabledFeatures=sharedNotes
2022-03-09 16:23:38 -03:00
Pedro Beschorner Marin
6ff1d680d9
feat(video): add meeting camera cap control
...
Include `meetingCameraCap` API param on create and enforce both server and
client to control the number of simultaneous webcams a meeting can have.
Disabled by default.
2022-03-07 09:36:55 -03:00
Gustavo Trott
f045aa7c31
Merge branch 'v2.5.x-release' into disabledFeatures-learningDashboard
2022-03-03 15:48:49 -03:00
Anton Georgiev
5f884f6674
Merge remote-tracking branch 'bbb/v2.4.x-release' into merge-24-into-25
2022-03-03 18:35:05 +00:00
Lucas Zawacki
140e08a730
Adapt code for merge
2022-03-02 11:24:54 -03:00
Anton Georgiev
3bd37f2ea4
Merge pull request #14492 from ramonlsouza/issue-14488
...
fix: Client crashing when clicking to "Select random user"
2022-03-02 09:20:58 -05:00
Anton Georgiev
212578b7c8
Merge branch 'v2.5.x-release' into disabledFeatures-learningDashboard
2022-03-02 08:46:31 -05:00
Anton Georgiev
9f6c6b7a0b
Merge pull request #14441 from pedrobmarin/r-s-fpr
...
refactor(screenshare): FreeSWITCH partial removal
2022-03-02 08:36:14 -05:00
Gustavo Trott
9d6eaead02
Move api param learningDashboardEnabled to disabledFeatures
2022-03-01 17:27:54 -03:00
Ramón Souza
3c8d620811
fix client crash in random user selection modal
2022-03-01 14:01:21 +00:00
Lucas Zawacki
9f51c19c24
fix(layout): Avoid crash on layout when reconnecting
2022-02-25 15:05:34 -03:00
Lucas Zawacki
6dfdc6a579
feature(layout): Push most layout parts with custom layout
2022-02-24 13:21:16 -03:00
Lucas Zawacki
48fb85d2b7
feature(layout): Separate layout data into a different collection
2022-02-23 17:46:54 -03:00
Pedro Beschorner Marin
6d80a413cf
refactor(screenshare): FreeSWITCH partial removal
...
Remove part of the old FreeSWITCH dependent WebRTC screenshare feature.
2022-02-23 13:03:51 -03:00
Pedro Beschorner Marin
e8ff5ebdc8
feat(video): add user camera cap control
...
Include `userCameraCap` API param on create and enforce both server and
client to control the number of simultaneous webcams an user can share.
Default set to 3.
2022-02-22 13:13:48 -03:00
Gustavo Trott
fb263babe6
Implements update breakout duration, and removes extend
2022-02-21 08:14:34 -03:00
Gustavo Trott
56de9af7d4
Undo comma removing
2022-02-07 16:00:13 -03:00
Gustavo Trott
580ebdc066
Move disabledFeatures to meetingProp, and rename feat screensharing to screenshare
2022-02-07 15:55:45 -03:00
Gustavo Trott
de4688bcdc
Implement new param disabledFeatures
2022-02-07 10:22:52 -03:00
Ramón Souza
16cd3c4ebb
Merge remote-tracking branch 'upstream/v2.4.x-release' into dev-24-0125
2022-01-25 16:56:52 +00:00
Pedro Beschorner Marin
810deb907b
refactor(etherpad): access control et al.
...
Move all Etherpad's access control from Meteor to a separated [Node application](https://github.com/bigbluebutton/bbb-pads ).
This new app uses [Etherpad's API](https://etherpad.org/doc/v1.8.4/#index_overview )
to create groups and manage session tokens for users to access them. Each group
represents one distinct pad at the html5 client.
- Removed locked users' access to pads: replaced readOnly pad's access with a new pad's content sharing routine
- Pad's access is now controlled by [Etherpad's API](https://etherpad.org/doc/v1.8.4/#index_overview )
- Closed captions edited content now reflects at it's live feedback
- Improved closed caption's dictation mode live feedback
- Moved all Etherpad's API control from Meteor to a separated [app](https://github.com/bigbluebutton/bbb-pads )
- Included access control both in akka-apps and bbb-pads
2022-01-21 16:56:01 -03:00
Gustavo Trott
7d55cac005
Implements virtualBackgroundsDisabled param to API /create
2022-01-12 18:21:58 -03:00
Ramón Souza
f6e65f58c5
merge 2.4 into develop and resolve conflicts - partial
2022-01-12 16:40:45 +00:00
prlanzarin
21c124b854
feat(webcams): server-side logic to allow moderators to close user's webcams
...
Includes a new create param/web conf called allowModsToEjectCameras, false by
default.
Ejection does not work in breakout rooms or with non-mod users
Ejection closes _all_ webcams shared by the target user
2021-12-13 19:49:41 +00:00
Ramón Souza
d1c516fef6
resolve html5 conflicts
2021-12-10 21:07:35 +00:00
Anton Georgiev
797fc49633
TEMP
2021-12-09 20:37:05 +00:00
hiroshisuga
0bc62f66f4
Feat(meeting): minimise sequential user pick ( #13831 )
...
Updating random user picker to reduce the probability that the exact same viewers would be selected first in successive random-pick runs
2021-12-07 12:36:34 -05:00
Gustavo Trott
0458212531
Merge remote-tracking branch 'upstream/develop' into breakouts-n-groups-assignments-2.5
2021-11-19 16:16:00 -03:00
Anton Georgiev
542db847ff
Merge pull request #13574 from Tainan404/smooth-reconnection-25
...
Improve data structure to not break on reconnections
2021-11-17 15:55:21 -05:00
Gustavo Trott
8555187df3
Resolve conflicts with Develop branch
2021-11-11 14:02:03 -03:00
Gustavo Trott
e919e24b38
Auto assign breakout names and users using lastBreakout or groups
2021-11-11 10:10:31 -03:00
Bohdan Zhemelinskyi
d5c80fc060
Improvement based on comments
2021-11-04 15:16:47 +00:00
Bohdan Zhemelinskyi
a20ee430ed
Improvements based on sonar cloud feedback
2021-11-03 19:16:55 +00:00
Tainan Felipe
f5eef03f3f
Improve data structure to not break on reconnections
2021-11-03 14:37:54 -03:00
Bohdan Zhemelinskyi
7ae476af3d
Stabilized rndom user select(commented)
2021-10-27 19:17:21 +00:00
Bohdan Zhemelinskyi
bb0ee66977
Stabilized rndom user select
2021-10-27 18:47:48 +00:00
Anton Georgiev
1622425cbc
Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into 2.4-into-develop
2021-10-22 19:12:58 +00:00
Gustavo Trott
0102104fbe
Makes bbb-web provide LearningDashboard data while meeting is alive
2021-10-14 14:00:25 -03:00
Tainan Felipe
1de8e0779d
Add server side reactivity to publications
2021-10-13 15:00:52 -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
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
Anton Georgiev
472c9a6107
Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into 237-into-develop
2021-07-20 15:21:21 +00:00
Joao Siebel
8462465a5f
Allow default layout config in bbb-web. close #12668
2021-07-19 11:02:58 -03:00
Gustavo Trott
c70967e7f1
Adds UI buttons to moderators open Activity Report
2021-07-15 21:23:16 -03:00
Gustavo Trott
45d4c310c2
Merge branch 'develop' into activity-report
2021-07-13 11:12:45 -03:00
Ramon Souza
604ae9cf6f
change default layout to smart
2021-07-13 09:25:53 -03:00
Ramon Souza
8fe8a0ac6b
display endWhenNoModerator message
2021-07-08 11:51:00 -03:00
Gustavo Trott
0417cbb03f
Adds Activity Dashboard initial version and generate activityReportAccessToken
2021-06-30 00:01:46 -03:00
Ramon Souza
ae49d7a9c6
remove layoutManager from meeting collection
2021-06-22 09:48:48 -03:00
Anton Georgiev
0c0eb8a4d5
Merge pull request #12548 from ramonlsouza/layout-meeting-collection
...
feat: layout manager in meeting collection
2021-06-18 18:03:19 -04:00
Ramon Souza
381207cb5a
set legacy as default layout manager
2021-06-18 17:05:29 -03:00
Pedro Beschorner Marin
068b82b1fa
refactor(connection status): remove legacy monitor
...
Remove parts of a previous connection monitor.
To add some context (as far as my memory goes) to the multiple connection
monitor features the product has, `stats` (currently named `connection status`)
was introduced at the Flash client back in ~2016. @fcecagno and I did it
as a BigBlueButton's Summit activity. Our work was squashed into a single
commit in 92554f8b3e#8374 ). Something that wasn't really
helping there was the adaptation of `stats` that was made to show local
feedback for each webcam connection. Although this feature wasn't being
used anymore, `network information` did rely on that to build up data. With
this monitor gone I assumed it was my responsibility to provide an alternative
so I promoted Mconf's port of the Flash `stats` monitor to BigBlueButton's
HTML5 client (#8579 ).
Well, that's my perspective on how things went for those features. If
anyone would like to correct me on something or add something else on
that history I would appreciate to know.
2021-06-13 14:02:46 -03:00
Ramon Souza
da924234d3
store layout manager in meeting collection
2021-06-09 15:30:08 -03:00
Ramon Souza
1ac3767ed4
store layout type in meeting collection
2021-06-09 14:08:11 -03:00
Max Franke
7f926edfcc
refactor(external videos): add own collection
...
Refactor the external videos collection, moving the logic and functionalities
outside of /imports/api/meetings to a new location in /external-videos/server/modifiers
in order to decrease the coupling between the functionalities, favoring
the maintenance.
2021-06-02 12:50:40 -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
Gustavo Trott
00240c925e
Implements endWhenNoModerator
2021-05-17 17:52:59 -03:00
Joao Siebel
ed4018149b
Add try/catch on meetings methods
2021-05-05 09:58:17 -03: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
Anton Georgiev
ff45cccd66
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into apr1-merge
2021-04-01 18:11:13 +00:00
Joao Siebel
c1503a2931
Remove banned users structure and handle reasonCode in validateAuthToken
2021-03-30 10:09:25 -03:00
Pedro Beschorner Marin
1aa7685dcc
Refactor Etherpad API calls
...
Isolate most Pad related functions and secure shared notes and closed
captions creation to only when there is a reachable Etherpad server
configured.
2021-03-29 18:35:33 -03:00
Anton Georgiev
ded205e196
Merge pull request #11722 from Tainan404/issue-11081
...
Add collection user persistent data
2021-03-26 08:56:41 -04: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
Tainan Felipe
e8f4d11446
Add collection user persistent data
2021-03-19 17:12:27 -03:00
Ramon Souza
ca345de246
add check after extractCredentials is used
2021-03-16 13:15:41 -03:00
Pedro Beschorner Marin
defc33a043
Removed callback from setGuestPolicy
2021-03-12 09:22:08 -03:00
Lucas Zawacki
07b51a6bf0
Correctly set guestPolicy to not overwrite userProps
2021-03-12 09:19:53 -03:00
Pedro Beschorner Marin
af64232e45
Change guest policy
2021-03-12 09:19:22 -03:00
Anton Georgiev
bbec7efb57
Merge pull request #11593 from pedrobmarin/2.3-lobby-message
...
Add guest lobby messages
2021-03-10 11:35:35 -05:00
Pedro Beschorner Marin
17f47fa4ea
Removed callback from setGuestLobbyMessage
2021-03-10 09:09:15 -03: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
