Daniel Petri Rocha
26a93f6853
Merge branch 'v2.6.x-release' into capture-shared-notes
2022-10-03 11:03:24 +02:00
Bohdan Zhemelinskyi
adcd139ec0
remove SetPollsXML
2022-09-30 14:24:09 +00:00
Gustavo Trott
7ec8e81b45
Fix bbb-web doesnt work with checksumHash=sha256
2022-09-28 21:21:17 -03:00
prlanzarin
0a796ef39d
feat(bbb-web): make HTTP session timeout configurable
...
Java/Grails' HTTP session inactivity timeout is hardcoded to 4 hours.
This gives less flexibility for long-lived sessions - ie in rare
scenarios where users stay connected for >= that amount of time without
any re-connections or intermediate calls to checkAuthorization.
This commit makes the HTTP session timeout configurable, system-wide, via
bigbluebutton.properties. Default timeout is preserved.
Ideally, we should look into a more permanent solution to avoid
invalidating perfectly healthy user sessions. This commit fixes
nothing in that regard.
2022-09-27 19:16:36 +00:00
Gustavo Trott
13c607025f
Merge pull request #15684 from paultrudel/update-checksum-hash-algorithm
2022-09-26 14:47:08 -03:00
Guilherme Pereira Leme
4074147231
Review
...
Co-authored-by: Gustavo Trott <gustavo@trott.com.br>
2022-09-26 08:47:20 -03:00
Brent Baccala
0efb5d90f9
on breakout room create meeting API call, lookup the parent meeting,
...
throw exception if it doesn't exist, and use its internal meeting ID
for parentMeetingId if it does
2022-09-23 17:59:54 -04:00
GuiLeme
633a032fd0
[issue-pdf-100-processing] - implemented retry flow and fixed error message
2022-09-22 16:58:37 -03:00
Daniel Petri Rocha
e23d00004f
'Capture Shared Notes' button in front-end
2022-09-20 17:43:13 +02:00
Daniel Petri Rocha
c84c2e2892
Merge branch 'v2.6.x-release' into breakout-upload-ui
2022-09-19 19:30:18 +02:00
Daniel Petri Rocha
edb2ff39cc
Perform upload upon breakout room timeout
2022-09-19 19:22:29 +02:00
GuiLeme
39b6359441
[issue-pdf-100-processing] - fix timeout error when PDF is too complex.
2022-09-14 10:33:41 -03:00
Paul Trudel
84c19bf12e
Added support for sha384 and sha512 checksums
2022-09-13 15:28:01 +00:00
Ramón Souza
ce539ec44a
rename external upload parameters
2022-09-12 11:04:13 -03:00
Daniel Petri Rocha
41f71981f4
Working checkbox in backend
2022-09-11 20:12:37 +02:00
Bohdan Zhemelinskyi
7f42e28ec7
place spring version in one place and cleanup
2022-09-08 18:40:19 +00:00
Bohdan Zhemelinskyi
f51742a819
Merge branch 'v2.6.x-release' of https://github.com/bigbluebutton/bigbluebutton into spring27
2022-09-08 14:32:35 +00:00
Daniel Petri Rocha
f1690247fd
Include capture checkbox in bbb-html5
2022-09-05 19:27:38 +02:00
Daniel Petri Rocha
16b3d43f19
Initial back-end wiring for breakout slides capture
2022-09-04 22:34:04 +02:00
GuiLeme
2dec0f051b
[apply-toast-shared-notes] - resolving conflicts
2022-09-02 16:08:24 -03:00
GuiLeme
80a381c87c
[apply-toast-shared-notes] - resolved conflicts and refactored temporaryPresentationId's name
2022-09-02 15:24:29 -03:00
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
