Anton Georgiev
5f4c5cdedb
Merge branch 'develop' into r-r-e-acea
2022-01-24 16:05:57 -05:00
Pedro Beschorner Marin
c9043655f1
Merge branch 'develop' into position-in-waiting-queue
2022-01-24 14:31:03 -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
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
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
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
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
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
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
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
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
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
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
Gustavo Trott
df60295d22
Implements join param excludeFromDashboard
2021-11-26 14:07:03 -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
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
