BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,465 Commits 13 Branches 260 Tags 1.1 GiB
cf8f7528d0
Commit Graph

837 Commits

Author SHA1 Message Date
Gustavo Trott
f7f20f3e2e
Merge pull request #15251 from ramonlsouza/issue-15001 2022-09-02 09:44:10 -03:00
Gustavo Trott
02b5ab1eb4
Merge pull request #15538 from GuiLeme/refactor-msg-builder 2022-09-01 17:54:12 -03:00
GuiLeme
3147df182b [refactor-msg-builder] - Removed unused files 2022-09-01 17:50:01 -03:00
Gustavo Trott
3b890e5509
Merge pull request #15608 from paultrudel/meeting-api-fixes 2022-08-31 15:21:48 -03:00
Paul Trudel
14aec9f7da Added maxParticpants calculation changes from 2.6 2022-08-29 15:25:14 +00:00
Ramón Souza
609d43157a Merge tag 'v2.5.5' into merge-2526-aug25 2022-08-25 14:33:44 -03:00
Gustavo Trott
37e9278371 bypass max users validation when maxUsers=0 2022-08-23 20:54:31 -03:00
GuiLeme
d9de398d90 [fix-page-count-exeed] - Forwarded temporaryPresentationId to front-end and refactor it's name 2022-08-22 15:00:27 -03:00
Paul Trudel
f84698cd5c changes to max pariticpants calculation and guest policy 2022-08-16 15:15:45 +00:00
GuiLeme
2aa7226c2e [refactor-msg-builder] - refactor of OfficeDocConversionProgress name 2022-08-15 12:19:12 -03:00
GuiLeme
1e0700b455 [apply-toast-shared-notes] - merge 26 and resolved conflicts 2022-08-03 11:12:55 -03:00
GuiLeme
74caa9cb5f [apply-toast-shared-notes] - Savepoint - Made some changes 2022-08-02 17:25:15 -03:00
Bohdan Zhemelinskyi
fd31c78ec4 temp changes 2022-07-29 19:03:25 +00:00
Ramón Souza
ccce085aed Merge remote-tracking branch 'upstream/v2.6.x-release' into issue-15001 2022-07-27 09:49:19 -03:00
Bohdan Zhemelinskyi
e016e6985b error detecting 2022-07-21 18:30:48 +00:00
Ramon Souza
81fb8ae74a undo uploadExternalUrl param quote removal 2022-07-20 10:06:51 -03:00
Ramon Souza
f2f1f4c18b remove other quote characters 2022-07-18 10:48:28 -03:00
Ramon Souza
22b2f38e18 replace quote characters in uploadExternalUrl param 2022-07-18 10:34:57 -03:00
Ramon Souza
db5ac1428a Merge tag 'v2.5.3' into merge25-26-jul14 2022-07-15 11:08:02 -03:00
Anton Georgiev
07dd5f2b84 fix: tweak inline comments to point to nodejs dir 2022-07-12 16:55:51 +00:00
Bohdan Zhemelinskyi
1906d0be22 common-web extra change 2022-07-07 19:30:26 +00:00
Daniel Petri Rocha
ef45c9675f Add cropbox parameter to thumbnails and recording processing step 2022-07-06 18:16:08 +02:00
Paul Trudel
4b33ae27a5 Added default username/password for pg connection and hibernate config file 2022-06-29 13:27:14 +00:00
Paul Trudel
ff8a68e20b Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into recording-api-changes 2022-06-29 13:24:45 +00:00
Ramon Souza
17c0bced1d add uploadExternalDescription and uploadExternalUrl create params 2022-06-23 14:42:23 -03:00
Anton Georgiev
c4874398f6 chore: Merge 2.5.0-rc.2 into develop 2022-05-13 21:03:34 +00:00
Guilherme Leme
32a86498e5 [issue-9789] - Changes in review 2022-05-05 09:56:40 -03:00
Guilherme Leme
0a384a1331 [issue-9789] - Created the event startConfiguration to store the initial state of WebcamsOnlyForModerator property 2022-04-28 15:59:12 -03:00
Paul Trudel
f5c2e1929c Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into recording-api-changes 2022-04-21 15:01:44 +00:00
Arthurk12
cff605e996 feat(webcam): pin multiple cameras simultaneously 
Adds support for multiple cameras pins.
The pinned cameras are stored in a FIFO-type queue
When a camera is pinned the oldest one is removed.
The queue size can be set via create parameter 'maxPinnedCameras',
if not defaults to 3.
 2022-04-18 20:17:58 +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
Anton Georgiev
13bed65baf chore: drop obsolete Dockerfile from BBB 2022-04-12 20:34:28 +00:00
Paul Trudel
50662e3e65 Fixed issue with pagination response 2022-04-11 19:50:33 +00:00
Paul Trudel
1d434e65b7 Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into recording-api-changes 2022-04-11 13:36:11 +00:00
Anton Georgiev
1500fb6a29 Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into merge-25-dev 2022-04-09 00:55:25 +00:00
Anton Georgiev
33575e60e6 Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into v2.5.x-release 2022-04-09 00:48:14 +00:00
Ramon Souza
1c873bd8d6 Merge remote-tracking branch 'upstream/v2.4.x-release' into merge-2425-apr08 2022-04-08 17:30:21 -03:00
Paul Trudel
7ec0e9b186 Fixed import errors 2022-04-08 19:48:39 +00:00
Paul Trudel
aa956919c2 Updated recording changes for 2.6 2022-04-08 18:46:54 +00:00
Gustavo Trott
f7d1b153a6 Keep blank line on end of gitignore files 2022-04-07 17:36:26 -03:00
Gustavo Trott
df1fc781f6 Add .bsp directory to .gitignore 2022-04-07 17:34:01 -03:00
Ramon Souza
4c328bc4ea Merge remote-tracking branch 'upstream/develop' into issue-14382 2022-04-04 16:25:50 -03:00
Anton Georgiev
4ad4e8e7fa
Merge pull request #14668 from GuiLeme/issue-14335 
[issue-14335]- Deprecate password on the endpoints.
 2022-03-30 11:47:55 -04:00
Gustavo Trott
4730e4c6db Add params meetingExpireIfNoUserJoinedInMinutes and meetingExpireWhenLastUserLeftInMinutes to API 2022-03-30 10:58:16 -03:00
Guilherme Leme
247794ff45 [issue-14335] - Changes in review, the random password has been added if a null one is sent while creating the meeting to avoid crashes in old integrations. 2022-03-30 10:07:46 -03:00
Guilherme Leme
c6653cd4b2 [Issue-14321]- Changes in Review 2022-03-25 14:12:10 -03:00
Ramon Souza
68f55b8c7b Merge remote-tracking branch 'upstream/develop' into issue-14382 2022-03-25 09:21:15 -03:00
Guilherme Leme
b4bf27c199 [issue-14335]- Refactored endpoints to not need the password anymore. It is in deprecated state now. 2022-03-24 15:35:17 -03:00
Gustavo Trott
a6c3af7b0f Add disabledFeatures=virtualBackgrounds 2022-03-22 16:01:27 -03:00
Gustavo Trott
4cb563085f Implements param lockSettingsHideViewersCursor 2022-03-21 15:25:41 -03:00
Anton Georgiev
adfbaa4409
Merge pull request #14599 from gustavotrott/disabledFeatures-breakoutRooms 
feat: Support to disable breakout rooms via disabledFeatures
 2022-03-18 14:41:02 -04:00
Ramon Souza
a89e9da4ea Merge remote-tracking branch 'upstream/develop' into issue-14382 2022-03-16 16:53:17 -03:00
Anton Georgiev
7501c2788a Merge branch 'java11-2' of github.com:zhem0004/bigbluebutton into java11-2 2022-03-16 18:04:06 +00:00
Gustavo Trott
6562cbc6e7
Merge branch 'v2.5.x-release' into disabledFeatures-breakoutRooms 2022-03-16 14:57:46 -03:00
Bohdan Zhemelinskyi
c76ab27d8e update for fsesl 2022-03-16 17:46:18 +00:00
Bohdan Zhemelinskyi
cb716b005b modified common-message for java 11 2022-03-16 17:45:11 +00:00
Anton Georgiev
d4e8f6ef4a
Merge pull request #14572 from gustavotrott/support-disabledFeatures 
fix: Keep support for deprecated API param learningDashboardEnabled
 2022-03-16 11:46:29 -04:00
Gustavo Trott
c770d3ccdd Allow API param override config bbb.properties 2022-03-14 16:46:11 -03: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
Guilherme Leme
9104a0308e [issue-14321] - Changes to make it possible to send 2 presentations with the same name 2022-03-14 12:10:27 -03:00
Ramón Souza
e5a3bffb36 add notifyRecordingIsOn param to breakout rooms 2022-03-14 13:58:21 +00:00
Ramón Souza
d008981855 add notifyRecordingIsOn create param 2022-03-10 20:17:57 +00: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
bedaf4de98 Add support for deprecated API param learningDashboardEnabled 2022-03-09 18:04:34 -03:00
Gustavo Trott
a4f4f24160 Convert groups roster to array of strings instead of array of objects 2022-03-07 15:08:00 -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
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
Anton Georgiev
4e268dffa3 WIP target JVM8 -> JVM11 2022-02-25 04:39:48 +00:00
Anton Georgiev
9c3be36552 Merge branch 'origin/jdk-17-upgrade' of github.com:himanshugoyal1065/bigbluebutton into test-java-11 2022-02-24 16:53:47 +00:00
Anton Georgiev
f561099729 Merge branch 'jdk-17-upgrade' of github.com:himanshugoyal1065/bigbluebutton into test-java-11 2022-02-24 16:53:04 +00:00
Ramón Souza
138f4d64e4 Merge remote-tracking branch 'upstream/v2.4.x-release' into v2.5.x-release 2022-02-24 14:49:56 +00: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
Anton Georgiev
eb9cea331f
Merge pull request #14389 from gustavotrott/sbt-force-update 
fix: Force update of common-message and common-web libs
 2022-02-17 09:11:05 -05:00
Gustavo Trott
def7fc65c3 Update common-message and common-web using sbt update 2022-02-17 10:58:41 -03:00
Anton Georgiev
2d3c12def3
Merge pull request #14264 from GuiLeme/issue-14014 
Created endpoint to insert file into presentation.
 2022-02-16 15:10:12 -05:00
Anton Georgiev
070eafe880
Merge pull request #14334 from Tainan404/fix-left-guest-user 
Add a message for when the guest isn't valid
 2022-02-16 14:55:00 -05:00
Tainan Felipe
d609a1fd8d Fix lint errors 2022-02-16 15:55:11 -03:00
Gustavo Trott
fbf58de625 Add timeout to Soffice docker execution 2022-02-15 15:00:57 -03:00
Gustavo Trott
ac4621da4d Improvements in deploy.sh script 2022-02-11 14:26:57 -03:00
Gustavo Trott
dab0ee8b19 Clear cache of common-message and common-web before publish 2022-02-11 14:03:25 -03:00
Guilherme Leme
a4aaf63a75 [issue-14014] - Removed password from insert endpoint. 2022-02-10 17:43:12 -03:00
Tainan Felipe
b730ef7aa2 Add a message for when the guest isn't valid 2022-02-10 16:31:35 -03:00
Pedro Beschorner Marin
982cd934b4 feat(guest): configurable wait timeout 
Replace the hardcoded guest's waiting timeout between polling requests - reference used
to remove a guest from the waiting list when the user leaves the waiting page - with a
bbb-web's configuration property.
 2022-02-10 08:24:57 -03:00
Guilherme Leme
c10dd9121e [issue-14014] - Made some changes in back-end logic to put the first presentation as current, if none is marked as current. 2022-02-09 10:40:42 -03: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
Guilherme Leme
ea09c7001c [issue-14014] - WIP adding current tag on presentation payload 2022-02-04 14:52:53 -03:00
Guilherme Leme
7650967b2f Resolved merging conflicts. 2022-02-04 08:48:58 -03:00
Guilherme Leme
75f3eab3f8 Resolve merging conflicts 2022-02-03 12:03:26 -03:00
Guilherme Leme
ff9916866a Implemented validation and created the template as well as the response builder for this endpoint. 2022-02-03 09:39:01 -03:00
Guilherme Leme
655c81c8f4 [Issue-14014]-Implemented the logic in the controller and refactored the function uploadDocuments to fit the new scenario. I also created the insert model to be validated. 2022-02-03 09:33:29 -03:00
Gustavo Trott
4e3711c1bd Resolve conflicts on backend marging 24->Develop 2022-01-27 08:29:14 -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
a761f0177a
Merge pull request #14143 from frankemax/fix-userdata-injection 
fix(userdata): consistent breakout room userdata
 2022-01-24 15:10:38 -05:00
Anton Georgiev
16f5b104d3
Merge pull request #14112 from pedrobmarin/f-a-aaamcp 
feat(api): allowRequestsWithoutSession as a meeting create param
 2022-01-24 15:08:26 -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
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
Guilherme Leme
fe2a7e82de [Issue-13238]-Refactored classes to fit the new presentation structure (With the removable attribute). 2022-01-21 11:43:30 -03:00
SashoVihVas
d99c271fa6 This commit includes following changes: 
1.HashMap updates in Meeting.java are updated
2.callback is removed from setGuestStatus.js
3.MeetingService.java passes the guest list instead of iterating through it
 2022-01-20 18:24:25 +00:00
Aleksandar Vasilev
06799ad64f
Corrected HashMap updates in Meeting.java 2022-01-20 04:08:59 +02:00
Arthurk12
3e4d918b47 fix(breakouts): user with no custom data 
Fixes null pointer exception when user has no custom data.
 2022-01-19 10:58:29 -03:00
Pedro Beschorner Marin
4a0882f9f2 fix(userdata): merge breakout room userdata 
Avoid using MongoDB to copy breakout room user's userdata. All userdata is
now merged at bbb-web's join API call.
 2022-01-19 10:58:13 -03:00
Pedro Beschorner Marin
2bc370ce0b feat(api): allowRequestsWithoutSession as a meeting create param 
Add a create meeting parameter to enable or disable the user's cookie
session requests.
 2022-01-17 09:51: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
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
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
Gustavo Trott
e930bcefd5 fix: Adds support for big numbers in learningDashboardCleanupDelayInMinutes 2022-01-10 18:37:11 -03:00
Gustavo Trott
af4bf7e6f1 Handles Dashboard cleanUpDelayMinutes greater than allowed 2022-01-10 16:51:19 -03:00
root
427cd8ac34 Merge branch 'develop' into origin/jdk-17-upgrade 2021-12-17 15:59:00 +00:00
Richard Alam
223b5488c7
Merge pull request #13932 from paultrudel/make-create-passwords-optional 
Added logging for passwords
 2021-12-15 14:30:31 -05:00
paultrudel
65688af8b0 Added logging for passwords 2021-12-15 14:28:37 -05:00
Richard Alam
0a8330a98b
Merge pull request #13928 from paultrudel/make-create-passwords-optional 
Make create passwords optional
 2021-12-15 09:39:51 -05:00
paultrudel
0ad6d6a2b8 Passwords are now optional for create requests 2021-12-15 09:33:36 -05: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
paultrudel
6213e4badd Added new constraint to join request to validate passwords 2021-12-06 13:29:44 -05:00
root
1b40921ca2 upgrading dependencies for bbb-common-web 2021-12-04 17:50:47 +00:00
root
ce7362380b Merge branch 'develop' into origin/jdk-17-upgrade 2021-12-03 14:04:02 +00:00
root
e3330d0e07 upgrading bbb-common-web 2021-11-27 09:42:25 +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
02750b35ef Let interface define group name when its null (in favor of intl) 2021-11-11 10:25:40 -03:00
Gustavo Trott
e919e24b38 Auto assign breakout names and users using lastBreakout or groups 2021-11-11 10:10:31 -03:00
Joao Siebel
1f6d44763f Add version tag back to api response 2021-11-03 11:11:33 -03:00
Anton Georgiev
123705bd37
Merge pull request #13609 from jfsiebel/bbb-version-api-response 
Add bbb version in api response
 2021-11-02 16:35:38 -04:00
Joao Siebel
cb4c21a7ac Add bbb version in api response 2021-10-29 17:20:19 -03:00
Joao Siebel
3796d152a4 Fix setRole and remove required 2021-10-27 16:10:12 -03:00
Joao Siebel
7ea48706ef Add role parameter on join 2021-10-27 15:28:11 -03:00
Gustavo Trott
ae88e8d325 Add Api/learningDashboard properly validation 2021-10-18 18:15:46 -03:00
Anton Georgiev
a1e3bbebd3
Merge pull request #13488 from gustavotrott/learning-dashboard-individual-token 
refactor: Makes LearningDashboard data be provided by bbb-web (avoid demoted user to receive updates)
 2021-10-18 13:37:03 -04:00
Gustavo Trott
0102104fbe Makes bbb-web provide LearningDashboard data while meeting is alive 2021-10-14 14:00:25 -03:00
paultrudel
d5405edcee Checksum constrain is now validated before any other constraints 2021-10-06 16:36:14 -04:00
paultrudel
6f40fa115d Merge branch 'v2.4.x-release' of https://github.com/bigbluebutton/bigbluebutton into change-message-key-value 2021-10-06 16:02:48 -04:00
paultrudel
a6d2dfd8ba removed some unused code 2021-10-06 10:40:40 -04:00
paultrudel
fa3fce9678 allow all parameters to be sent in th request body and have a null query string 2021-10-06 10:36:21 -04:00
paultrudel
5b4ea24ea8 All constraints now have both a key and a message parameter 2021-10-04 13:50:17 -04:00
Gustavo Trott
64f0c7cf29 Disable LearningDashboard for Breakout Rooms 2021-10-04 11:09:47 -03:00
paultrudel
5e3f33131c Reverted the messageKey values in validation error messages back to their old values 2021-10-01 15:31:30 -04:00
paultrudel
65a7ecacbb Join and end request passwords still required 2021-09-15 09:48:39 -04:00
paultrudel
9c6974741b moderatorPW and attendeePW and no longer required for create requests 2021-09-15 09:11:27 -04:00
Joao Siebel
05ba0db81a Remove presentation on end 2021-09-10 16:25:01 -03:00
Joao Siebel
6286d8bc9c Prevent some cases where the presentation conversions didn't end in some breakouts. close #13109 2021-09-10 15:39:46 -03:00
Anton Georgiev
a8bebbe91c
Merge pull request #13133 from gustavotrott/learning-dashboard-adjustments 
Makes configurable the delay to clean up Learning Dashboard
 2021-09-02 10:45:15 -04:00
Gustavo Trott
d2c405ddf2 Renames config learningDashboardCleanupInMinutes to learningDashboardCleanupDelayInMinutes 2021-09-01 16:52:52 -03:00
paultrudel
39aaa52b25 Move max participant check back to Api 
Controller
 2021-09-01 15:50:45 -04:00
Gustavo Trott
76c6a9d107 Replaces config learningDashboardCleanupEnabled by learningDashboardCleanupInMinutes 2021-09-01 15:51:22 -03:00
Gustavo Trott
049981da01 Renames activity_report.json to learning_dashboard_data.json 2021-09-01 11:38:00 -03:00
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
4c4323ec69 Implements Clean up of LearningDashboard files when meeting ends 2021-08-26 14:18:09 -03:00
Gustavo Trott
ef4de06cf8 Fix problem in param learningDashboardEnabled 2021-08-25 17:19:04 -03: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
1db49719c9 feat(web): set default logo 
Add an option to set a default logo to be placed for all created meetings.

The default logo is inserted as a create meeting param for all meetings that
do not have a `logo` param defined. Two new properties were included at
bigbluebutton-web configuration:

- [Boolean] `useDefaultLogo`: enables/disables the use of the default logo
  disabled as default

- [String] `defaultLogoURL`: The default logo URL to be fetched by the client
  bigbluebutton logo as default
 2021-08-19 15:22:44 -03:00
Anton Georgiev
d75900d5a2
Merge pull request #12924 from gustavotrott/activity-report-2 
Activity Report - New Dashboard layout
 2021-08-06 12:44:39 -04:00
paultrudel
f5b55a6bdb modified how the checksum is removed from the query string 2021-08-05 14:55:35 -04:00
paultrudel
ad8578f476 allowed the use of commas in meeting names 2021-08-04 16:07:54 -04: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
Anton Georgiev
73da9c15da Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-23-july-30 2021-07-30 23:43:27 +00:00
paultrudel
2af81a3a9e fixed issue with guests not joining meeting after being approved 2021-07-30 15:57:30 -04:00
paultrudel
c325713167 null values are now allowed for parameters that are not required 2021-07-30 10:04:17 -04:00
paultrudel
5687842f17 converted boolean input values to lowercase before validating them 2021-07-29 10:38:39 -04:00
paultrudel
0ef55cd592 modified boolean validator to accept 0 and 1 as valid boolean values 2021-07-29 09:58:45 -04:00
paultrudel
4fcf4f991b modified regex pattern to allow international characters in meeting name/id 2021-07-28 09:56:42 -04:00
Marcel Hellkamp
500a1e6ff4 fix(common-web): Sub-processes hang if output buffers fill up 
ExternalProcessExecutor spawned sub-processes with stderr and
stdout buffers, but did not read from those buffers. Sub-processes
producing output sometimes would fill up these buffers and then hang
until the timeout occurs and the process is killed.

This fixes #12839 (PDF conversion hangs for 10 seconds per page)
by properly discarding command output. The patch also deprecates an
outdated and dangerous API and offers a safer alternative. Splitting
command arguments based on whitespace may result in unwanted behavior
if an argument (e.g. a filename) contains whitespace.
 2021-07-28 14:56:26 +02:00
Gustavo Trott
e4ef1582f2
Merge branch 'develop' into activity-report 2021-07-22 11:33:47 -03:00
Gustavo Trott
4e211d70a8 Removes unnecessary comments 2021-07-22 11:13:30 -03:00
Gustavo Trott
3c6155a73e Creates config activityReportTracking to enable Activity Report 2021-07-22 11:09:44 -03:00
Gustavo Trott
b0f9835ffd Merge branch 'develop' into activity-report 2021-07-21 14:20:27 -03:00
Joao Siebel
8462465a5f Allow default layout config in bbb-web. close #12668 2021-07-19 11:02:58 -03:00
paultrudel
4a0f1b773b made voice bridge an optional parameter 2021-07-13 12:30:44 -04:00
paultrudel
43e454fca8 breakout room and record are no longer required parameters for create requests 2021-07-13 11:27:59 -04:00
Gustavo Trott
45d4c310c2 Merge branch 'develop' into activity-report 2021-07-13 11:12:45 -03:00
Anton Georgiev
2c28206ea1
Merge pull request #12564 from gustavotrott/breakoutrooms-set-name 
Adds possibility to give a name to breakout rooms
 2021-07-12 16:30:14 -04:00
Anton Georgiev
8cf5b64a0f
Merge pull request #12693 from paultrudel/update-api-validation 
Updates to BBB-Web API validation
 2021-07-12 16:20:34 -04:00
Gustavo Trott
5c602fd2b0
Merge branch 'develop' into breakoutrooms-set-name 2021-07-12 16:31:38 -03:00
paultrudel
e5f13e7916 added postman test scripts to test to the functionality of the bbb-web api 2021-07-12 11:24:09 -04:00
Gustavo Trott
1d7dcb200a Add improvements in Nginx config 2021-07-09 15:24:08 -03:00
paultrudel
6b9463daf8 added type conversion check for createTime parameter in join meeting 2021-07-07 11:44:55 -04:00
paultrudel
af32ac984d added new constraints to ensure proper data format 2021-07-05 14:08:56 -04:00
paultrudel
5db8c769c2 fixed freemarker getSessions null error 2021-07-02 10:57:45 -04:00
paultrudel
078a369b68 Minor bug fixes to validation in some validators 2021-06-30 13:21:28 -04:00
paultrudel
f74ea387d7 updates to validation on all api endpoints 2021-06-30 10:17:08 -04: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
paultrudel
1191713b48 fixed merge conflicts 2021-06-24 10:03:02 -04:00
paultrudel
a2cd27c1f9 merge with update-api-create-join-validation 2021-06-24 09:32:23 -04:00
paultrudel
1cdfbbd08a updated validation for bbb-web api create/join 2021-06-23 11:17:35 -04: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
Anton Georgiev
3e5214234b
Merge pull request #12469 from jfsiebel/allow-tags-meeting-user-name 
Allow tags in meeting and user name
 2021-06-15 10:28:58 -04:00
Max Franke
4757107f6f fix(breakout-room): avoid muteOnStart at breakout room 
Quick fix to prevent the moderator who joins the
breakout room from being unable to unmute himself
 2021-06-14 19:28:29 -03:00
Gustavo Trott
37dea2215b Translates dynamically breakout room Names when default name is being used 2021-06-14 16:59:27 -03:00
Anton Georgiev
06b73419a6 fix: endWhenNoModerator* passed meetingCreate params should override default values 2021-06-03 19:46:57 +00:00
Anton Georgiev
e01bdf69c5 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into june2-merge-into-develop 2021-06-02 18:45:31 +00:00
Joao Siebel
eedf3a00f2 Remove stripHTMLTags method 2021-05-31 13:14:39 -03:00
Joao Siebel
f16700a8c4 Allow tags in meeting and user name. close #10221 close #12370 2021-05-31 09:59:15 -03:00
Anton Georgiev
ced0cc0b26 removed configXML from bbb-web 2021-05-22 16:13:29 +00:00
Gustavo Trott
00240c925e Implements endWhenNoModerator 2021-05-17 17:52:59 -03:00
Gustavo Trott
7ab6a2c4c9 Detects if PDF contains font Type 3 and rasterize automatically 2021-04-28 15:47:55 -03:00
Gustavo Trott
b6e0a571d5 Implements forceRasterizeSlides (force convert presentation to png before svg) and pngWidthRasterizedSlides (force png width (px)) 2021-04-22 21:57:55 -03:00
Gustavo Trott
a08a0d33e1 Makes presentation svg resolution configurable, and set default to 300 2021-04-19 16:01:48 -03:00
Gustavo Trott
3e675af3b5 Akka broadcasts UploadedFile Too Large error msg 2021-04-08 16:49:17 -03: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
Gustavo Trott
8a1d5ba8a0 Handle and log timeout error during Office2Pdf conversion 2021-03-31 14:21:00 -03:00
Gustavo Trott
64d3afbb1c Changes timeout error text 2021-03-31 14:19:47 -03:00
Gustavo Trott
4b4588c20d Handle and log timeout errors during conversions 2021-03-31 12:10:02 -03:00
Gustavo Trott
1c6f8a1610 Moves default pdfToSvg conversion timeout to config 2021-03-30 18:29:34 -03:00
Anton Georgiev
75e935d771
Merge pull request #11809 from gustavotrott/develop 
Enhancements to presentation OfficeToPDF conversion
 2021-03-30 12:27:25 -04:00
Gustavo Trott
58a05acce6 Implements max concurrent office2pdf conversions and set conversion timeout from config 2021-03-30 11:26:03 -03:00
Anton Georgiev
d131b0a7bf
Merge pull request #11717 from gustavotrott/develop 
Adds a customizable "office to pdf" converter for presentations
 2021-03-29 17:08:49 -04:00
Gustavo Trott
eab8e6488a Use of ProcessBuilder instead of Runtime.exec 2021-03-29 17:44:46 -03:00
Tiago D J
cab865c913
Quick fix to avoid empty slides 
This PR reduces the impact of #8618 by increasing hardcoded timeout from 7s to 60s

A subsequent PR is going to be sent by @gustavotrott to:

-> Make this timeout configurable;
-> Add a log telling that timeout happened
 2021-03-25 12:09:44 -03:00
Gustavo Trott
a69baba177 Removes jodconverter from project dependencies 2021-03-24 15:00:05 -03:00
Gustavo Trott
5c1271cf0d Removes files and codes not used anymore 2021-03-23 18:37:37 -03:00
Gustavo Trott
2f56f7415d Improves error handling 2021-03-23 10:46:39 -03:00
Gustavo Trott
1a6457f178 Adds presentation script path as parameter 2021-03-22 17:37:49 -03:00
Gustavo Trott
e9d5eca664 Replaces the presentation Office to Pdf converter using shellScript instead of jodconverter 2021-03-22 15:32:22 -03:00
Anton Georgiev
8302159255
Revert "Add getter for defaultKeepEvents" 2021-03-21 22:21:52 -04:00
Anton Georgiev
f8149578bd
Add getter for defaultKeepEvents 
Follow up to #11681
 2021-03-21 21:43:50 -04:00
Anton Georgiev
6c7da44940 replaced keepEvents with defaultKeepEvents and meetingKeepEvents 2021-03-18 02:31:47 +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
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
Pedro Beschorner Marin
f02384bb1f Fix padId getter 
Pad exporter uses this same location to serve pad's downloaded content
but the the match was failing because padId is not the last element
of the URL on that scenario.

Pattern follows /pad/p/<padID>[/export/(format)]?<query>.
 2021-03-03 20:36:19 -03:00
Anton Georgiev
f43560d535 Support for backend vs frontend nodejs instances bbb-html5 2021-02-16 03:19:31 +00: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
Anton Georgiev
363c801338
Merge pull request #11215 from pedrobmarin/guest-draft 
Disable authenticated guests
 2021-02-05 16:13:46 -05:00
Anton Georgiev
4459b11f78
Merge pull request #8907 from lkiesow/8900-dollar-in-room-name 
Fix Special Characters in Room Names
 2021-02-03 16:40:59 -05: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
Pedro Beschorner Marin
0bbef12ac7 Authenticated guests feature controlled at bbb-web properties 2021-01-23 21:48:02 -03:00
Pedro Beschorner Marin
ca7e3baf0f Check if stream already exists before adding in list 2021-01-08 13:48:36 -03:00