Gustavo Trott
fb263babe6
Implements update breakout duration, and removes extend
2022-02-21 08:14:34 -03:00
Anton Georgiev
60302d3e35
Merge pull request #14405 from antobinary/2.4.4-branch
...
Merge 2.4.4 into 2.5-alpha-1
2022-02-18 12:19:13 -05:00
Guilherme Leme
f6e144d71c
[issue-14243] - Changes in Akka, to save the events in redis, and changes in rap to process these changes.
2022-02-17 17:23:28 -03:00
Gustavo Trott
def7fc65c3
Update common-message and common-web using sbt update
2022-02-17 10:58:41 -03:00
Guilherme Leme
0e47fe4912
[issue-14243] - On Back-end, I just marked the message with the user's role.
2022-02-14 11:01:00 -03:00
Pedro Beschorner Marin
abdea74fc9
Merge pull request #14314 from frankemax/webcam-sync
...
fix(webcam): add state sync between bbb-html5 and akka-apps
2022-02-14 10:19:58 -03:00
Bohdan Zhemelinskyi
5a448766ad
added dial in prefix
2022-02-11 16:21:39 +00:00
Bohdan Zhemelinskyi
1d21b20379
fixes
2022-02-11 15:26:47 +00:00
root
9dbb5a0406
changing java arguments to 11
2022-02-11 09:58:55 +00:00
Anton Georgiev
006a9f9ffc
Merge pull request #14293 from gustavotrott/api-param-disabledFeatures
...
feat: new api Create param: disabledFeatures
2022-02-10 15:51:34 -05:00
Bohdan Zhemelinskyi
fbef4f43a7
Added logic
2022-02-10 15:42:54 +00:00
Bohdan Zhemelinskyi
0c63f0899e
fixed join permission for Phone Users
2022-02-10 15:42:26 +00:00
Paulo Lanzarin
8d91bae7e8
Revert "fix: Phone users to abide by guest policy"
2022-02-09 20:02:38 -03:00
Max Franke
d75734391a
fix(webcam): add state sync between bbb-html5 and akka-apps
2022-02-09 16:48:16 -03:00
Ramón Souza
dba04834c7
Merge remote-tracking branch 'upstream/v2.4.x-release' into 2524-feb08
2022-02-09 15:52:42 +00:00
Gustavo Trott
580ebdc066
Move disabledFeatures to meetingProp, and rename feat screensharing to screenshare
2022-02-07 15:55:45 -03:00
Himanshu Goyal
cf3b534604
Merge branch 'bigbluebutton:develop' into origin/jdk-17-upgrade
2022-02-07 19:12:25 +05:30
Gustavo Trott
dad9be2a6a
Merge remote-tracking branch 'upstream/v2.5.x-release' into api-param-disabledFeatures
2022-02-07 10:23:28 -03:00
Gustavo Trott
de4688bcdc
Implement new param disabledFeatures
2022-02-07 10:22:52 -03:00
Anton Georgiev
cf7184f504
Merge pull request #14269 from prlanzarin/u24-eight-statue
...
fix(webcams): add stream ID to broadcast check, better lock setting enforcement
2022-02-04 12:58:46 -05:00
prlanzarin
a8f3ebd661
fix(webcams): always run lock settings enforcement on user demotion
...
Checking for the user locked state before running the procedure is not entirely
correct since some lock settings should always be appleid. An example of the is
the See other viewers lock which must be enforced on demotion regardless of
whether the demoted user is locked or not.
2022-02-03 15:41:14 -03:00
Anton Georgiev
196e069160
Merge pull request #14173 from GuiLeme/issue-13238
...
feat(presentation): Add removable and downloadable attributes to payload.
2022-02-03 12:16:10 -05:00
Anton Georgiev
7152d23e39
Merge pull request #14147 from zhem0004/fixPhoneJoinPermission
...
fix: Phone users to abide by guest policy
2022-02-03 12:07:47 -05:00
prlanzarin
9dc54cdb5f
fix(webcams): add streamId to broadcast permission checks
...
Guarantees better enforcement of stream ownership
2022-02-03 13:12:28 -03:00
Anton Georgiev
68f9c36d8e
Merge pull request #14228 from gustavotrott/breakouts-message-to-all
...
feat: Send a chat message to all breakouts simultaneously
2022-02-03 10:25:20 -05:00
Guilherme Leme
75f3eab3f8
Resolve merging conflicts
2022-02-03 12:03:26 -03:00
prlanzarin
dd3e24a800
refactor(screenshare): add voiceConf to ScreenshareBroadcastStopSysMsg
...
Just to make it easier to guarantee idempotence in webrtc-sfu while we dont get rid of voiceConf usage
2022-02-01 13:01:51 -03:00
Gustavo Trott
38b256dba5
Remove unnecessary codes
2022-01-28 15:00:17 -03:00
Gustavo Trott
eb567eb106
Handle message to all breakouts sent
2022-01-28 14:41:10 -03:00
Bohdan Zhemelinskyi
fe91b448c2
Merge branch 'v2.4.x-release' of https://github.com/bigbluebutton/bigbluebutton into fixPhoneJoinPermission
2022-01-27 15:43:48 +00:00
Gustavo Trott
4e3711c1bd
Resolve conflicts on backend marging 24->Develop
2022-01-27 08:29:14 -03:00
Gustavo Trott
759535eb62
Implements message to all breakout rooms
2022-01-26 17:02:38 -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
Anton Georgiev
5f4c5cdedb
Merge branch 'develop' into r-r-e-acea
2022-01-24 16:05:57 -05:00
Anton Georgiev
2e72946bc1
Merge pull request #14088 from zhem0004/fixPhoneBan
...
Fix: Removing phone users always bans them
2022-01-24 15:50:30 -05:00
Bohdan Zhemelinskyi
98c45a2167
Changes on feedback
2022-01-24 20:46:32 +00:00
Anton Georgiev
b8ba4b5c71
Merge pull request #14075 from gustavotrott/api-create-virtual-background-param
...
Add param to disable Virtual Backgrounds in API /create
2022-01-24 15:04:30 -05:00
Pedro Beschorner Marin
c9043655f1
Merge branch 'develop' into position-in-waiting-queue
2022-01-24 14:31:03 -03:00
Bohdan Zhemelinskyi
a77eca86cd
Added logic
2022-01-24 16:24:28 +00:00
Paulo Lanzarin
1f4f60093d
Merge pull request #14091 from prlanzarin/u24-martha-55
...
fix(screenshare): add akka-apps|webrtc-sfu broadcast stop sys msg
2022-01-21 18:06:35 -03: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
Guilherme Leme
7d6156d298
[Issue-13238]-Refactored files to fit the new presentation structure (With the removable attribute). And refactored message services as well.
2022-01-21 11:49:44 -03:00
Anton Georgiev
6c196be63e
Merge pull request #13931 from zhem0004/BorderCase
...
FixGracePeriod
2022-01-20 08:52:27 -05:00
Aleksandar Vasilev
3b5781402c
Corrected HashMap updates in GuestsWaiting.scala
2022-01-20 04:11:34 +02:00
Bohdan Zhemelinskyi
8582ccd6db
fixed join permission for Phone Users
2022-01-19 18:35:04 +00:00
Aleksandar Vasilev
6935b8293c
Merge branch 'bigbluebutton:develop' into position-in-waiting-queue
2022-01-16 02:59:40 +01:00
Aleksandar Vasilev
6103ae960d
Merge branch 'bigbluebutton:develop' into develop-private-guest-lobby-messages
2022-01-16 02:58:43 +01:00
Bohdan Zhemelinskyi
df3da31f39
fixUsersGettBannedFromPhone
2022-01-13 18:43:16 +00:00
prlanzarin
f3e3d397a6
fix(screenshare): add akka-apps|webrtc-sfu broadcast stop sys msg
2022-01-13 12:34:49 -03:00
prlanzarin
8e822f4a6d
fix(screenshare): add state sync between bbb-html5 and akka-apps
...
A TODO 5 years in the making
2022-01-12 19:36:38 -03:00
Gustavo Trott
baf1b53407
Resolve conflicts in Ramon's 2.4 merge
2022-01-12 19:35:00 -03:00
Gustavo Trott
7d55cac005
Implements virtualBackgroundsDisabled param to API /create
2022-01-12 18:21:58 -03:00
germanocaumo
b71b9a0c85
fix(polls): fix wrong typed poll results due to race condition
...
Sometimes a vote for a new answer text was being computed as a vote for the first option due to poll collection late update.
2022-01-12 17:41:02 +00:00
Ramón Souza
f6e65f58c5
merge 2.4 into develop and resolve conflicts - partial
2022-01-12 16:40:45 +00:00
SashoVihVas
1862f60e05
Add private guest lobby messages
2022-01-12 14:10:30 +00:00
SashoVihVas
2d7c82e73d
Add position in waiting queue for guest users
2022-01-12 03:08:43 +00:00
hiroshisuga
142f9e447a
Fix annotation order for pen drawings #12249
2022-01-05 16:39:44 -05:00
Anton Georgiev
b41f895ab8
Merge pull request #13850 from Tainan404/remove-grace-period
...
Remove Grace Period for locked user in chat
2022-01-05 14:51:16 -05:00
Bohdan Zhemelinskyi
323bb606ef
FixGracePeriod
2022-01-04 18:41:11 +00:00
Max Franke
85ad9a5e30
feat(video): webcam video pinning server side logic
...
Add the new ChangeUserPinState messages to handle the new video pinning
functionality
2021-12-21 16:58:38 -03:00
root
427cd8ac34
Merge branch 'develop' into origin/jdk-17-upgrade
2021-12-17 15:59:00 +00:00
Anton Georgiev
69aba9ea6a
Merge pull request #13853 from zhem0004/fixModifyWhiteboardAccess
...
fixWhiteboardModifyPermissionsCheck
2021-12-15 14:08:26 -05:00
Tainan Felipe
50b10a1288
Add else returning the state
2021-12-15 14:02:39 -03:00
Anton Georgiev
b0c66caef9
Merge pull request #13915 from prlanzarin/u24-sprawling-pier
...
feat(webcams): add option to allow moderators to close another user's webcams
2021-12-15 09:24:11 -05:00
Gustavo Trott
35e465387b
Merge of last Dashboard 2.4 improvements
2021-12-15 10:35:14 -03:00
Anton Georgiev
3433396672
Merge pull request #13895 from gustavotrott/dashboard-cookies-fix
...
fix: Reduces Dashboard cookie lifetime
2021-12-14 13:04:07 -05:00
Anton Georgiev
26b19a1b55
Merge pull request #13826 from gustavotrott/dashboard-grouped-by-extId
...
Refactor: Dashboard grouped by extId
2021-12-14 10:17:18 -05: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
Anton Georgiev
dfcd6a4fe8
Resolved akka-apps conflicts
2021-12-10 23:08:40 +00:00
Gustavo Trott
63f60f5009
Reduce Dashboard cookie timelife
2021-12-10 17:15:47 -03:00
Anton Georgiev
797fc49633
TEMP
2021-12-09 20:37:05 +00:00
Anton Georgiev
75a64da3cc
refactor: Decrease time allowed for reconnection
...
We are receiving feedback that due to this 30s period that the user remains in the room, if a user exits a breakout room, that user won't be able to re-join it until 30s elapses.
More investigation is needed but given that this 30s value is somewhat large, I'm [temporarily] reducing it to 10s. Related #13531
2021-12-09 11:46:51 -05:00
Gustavo Trott
a8042a5b9e
Allow multiple choices poll in Dashboard
2021-12-08 10:40:09 -03:00
Bohdan Zhemelinskyi
3690c02b74
fixWhiteboardModifyPermissionsCheck
2021-12-07 20:02:28 +00:00
Tainan Felipe
7d6cc80eb0
Remove ejection behavior from locked users who sent chat message
2021-12-07 15:12:01 -03:00
Tainan Felipe
f98e57a617
Remove Grace Period for locked user on chat
2021-12-07 15:06:21 -03:00
Gustavo Trott
f50be91411
Only merge users (extId) if there is no overlap between differents intIds
2021-12-07 14:41:16 -03: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
root
f9ecbb135b
upgrading dependency of akka-bbb-apps
2021-12-04 10:44:11 +00:00
hiroshisuga
52bc4c5a90
remove a duplicated condition
2021-12-04 18:51:22 +09:00
Anton Georgiev
dce14adf50
Merge pull request #13803 from zhem0004/fixAnnotationPermissionCheck
...
Fixed annotation permission
2021-12-03 15:18:25 -05:00
Gustavo Trott
f44801e13c
Groups dashboard data by extId
2021-12-03 15:47:16 -03:00
root
ce7362380b
Merge branch 'develop' into origin/jdk-17-upgrade
2021-12-03 14:04:02 +00:00
Anton Georgiev
a4a37233a9
Merge pull request #13766 from Tainan404/fix-ejected-user-not-validated
...
fix: Fixes the validation of banned users
2021-12-02 16:12:29 -05:00
Anton Georgiev
c89dde225e
Merge pull request #13817 from zhem0004/FixEmojiStatusPermissions
...
fix: Fix Emoji Permissions in akka-apps
2021-12-02 16:02:57 -05:00
Anton Georgiev
efd3c160fa
Merge pull request #13790 from prlanzarin/u24-second-tragic-laurel
...
fix(webcams): viewer accounting, improved perm. checks in akka-apps, [...]
2021-12-02 15:11:19 -05:00
Bohdan Zhemelinskyi
404bc83f18
FixEmojiPermissions
2021-12-02 18:37:47 +00:00
Gustavo Trott
54d510bae1
Merge remote-tracking branch 'upstream/develop' into fix-breakout-freejoin-assignments
2021-12-02 11:10:58 -03:00
Gustavo Trott
fe944c1bdb
Fix breakouts assignments when freeJoin is true
2021-12-02 11:05:42 -03:00
Bohdan Zhemelinskyi
af947d68a2
Fixed annotation permission
2021-12-01 20:29:20 +00:00
Anton Georgiev
94f85ad68a
Merge pull request #13678 from gustavotrott/breakouts-n-groups-assignments-2.5
...
feat: Auto assign Breakouts (names and users) using previous rooms info or groups info
2021-12-01 15:01:23 -05:00
prlanzarin
3e6b849458
fix(webcams): viewer accounting, improved perm. checks in akka-apps, ...
...
- Improve permission checks by making them lock-settings aware
- Account for camera viewers in akka-apps. They should now be
present in the analytics endpoint
- Further integrate akka-apps and webrtc-sfu so their states remain
consistent. We'd also like to be able to slowly dehydrate some
of the logic that today resides in webrtc-sfu and move it to
akka-apps and this is a first step.
- Add additional broadcasted stream ID checks (ownership and streamID
format)
2021-11-30 18:40:37 +00:00
root
3f2f1678ce
upgrading akka-bbb-apps
2021-11-29 17:03:44 +00:00
Tainan Felipe
30cef81400
Fixes the validation of banned users
2021-11-26 15:34:38 -03:00
Gustavo Trott
df60295d22
Implements join param excludeFromDashboard
2021-11-26 14:07:03 -03:00
Gustavo Trott
4ebd27065a
Include presentations info to Learning Dashboard Json
2021-11-17 14:42:34 -03: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
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
Anton Georgiev
c60ef3c179
Merge pull request #13253 from ramonlsouza/PR-11359
...
feat: multiple choice poll
2021-10-26 14:42:29 -04:00
