Commit Graph

1996 Commits

Author SHA1 Message Date
Ramón Souza
af8556e026 Merge remote-tracking branch 'upstream/v2.6.x-release' into 26-27-apr24 2023-04-24 17:15:47 -03:00
Paul Trudel
c378ffe4a9 Added new properties for supported protocols and blocked hosts 2023-04-21 15:29:19 +00:00
Daniel Molkentin
0505e04154 fix: Do not format maxUsers in the getMeetings API response
- This should be computational output
- It's consistent with getMeetingInfo
2023-04-21 17:25:20 +02:00
GuiLeme
6e05e3ca51 [issue-17131] - Suggestions in review and some change of behavior 2023-04-20 08:48:43 -03:00
Gustavo Trott
e3a2e4b01a Store sessionToken in akka-apps (in order to invalidate connections in graphql-middleware) 2023-04-14 15:48:10 -03:00
Paul Trudel
2bae304603 Fixed issue with unreleased streams 2023-04-14 18:28:13 +00:00
Anton Georgiev
b5440c0d6f
Merge pull request #17202 from paultrudel/redirect-on-max-participants
fix/feature (bbb-web): Add new join param `errorRedirectUrl` and fix to respect redirect
2023-04-14 14:00:05 -04:00
Paul Trudel
f0ed95f724 Renamed join param redirectUrl to errorRedirectUrl 2023-04-13 14:26:48 +00:00
Gustavo Trott
63bc1593d5 Apply locksettings-hideUserList as validation on fetch users in Hasura 2023-04-12 11:07:54 -03:00
Gustavo Trott
a7a4005cd5 Fix [''] as default value for disabledFeatures 2023-04-10 11:22:16 -03:00
Gustavo Trott
be4bac6037 Merge with v2.7.x-release 2023-04-05 15:05:16 -03:00
Paul Trudel
b55d152d2c Removed ClientConfigService from bbb-web 2023-03-31 13:24:02 +00:00
Anton Georgiev
badfe80c4d
Merge pull request #16919 from paultrudel/exclude-graal-h2-dependencies
fix(sec): Exclude GraalVM and H2 Dependencies
2023-03-28 10:43:11 -04:00
Paul Trudel
87d0e9845e Upgraded Spring WebMVC version 2023-03-23 20:44:49 +00:00
Paul Trudel
657d608bbb Added new join param redirectUrl and fixed redirect 2023-03-23 19:11:49 +00:00
Gustavo Trott
0aa923e269 Merge remote-tracking branch 'origin/bbb-graphql-server' into bbb27-graphql-server 2023-03-21 08:36:50 -03:00
Anton Georgiev
592ed2a97a
Merge pull request #16982 from paultrudel/guest-deny-error-message
fix: Display error message when guest is denied access to a meeting
2023-03-17 13:41:59 -04:00
Gustavo Trott
a9b0bb3b0a Add endpoint api/checkGraphqlAuthorization 2023-03-13 15:45:33 -03:00
Gustavo Trott
f641b71b4a Adjusts to run graphql client 2023-03-11 12:11:50 -03:00
Anton Georgiev
49edb857fe
fix: Allow for existing dir 'exploded' in bbb-web deploy_to_usr_share.sh 2023-03-09 16:23:21 -05:00
Paul Trudel
5de1eed038 Added error message when guest is denied access to meeting 2023-03-09 20:57:26 +00:00
prlanzarin
58f7fa3df6 fix: encode user-name before sending it as header to checkAuthorization users
Lack of encoding is causing some specific languages to have the user-name
header stripped out from the HTTP Upgrade requests used by the
checkAuthorization users (bbb-webrtc-sfu). That translates to
webcam/screenshare/listen only failing due to an incomplete header set.
2023-03-06 10:12:34 -03:00
Paul Trudel
da1905afb2 Exclude H2 dependency 2023-03-03 19:32:55 +00:00
Paul Trudel
14fa5e01c7 Excluded GraalVM SDK dependency 2023-03-03 19:25:33 +00:00
Anton Georgiev
d5449a05e5
Merge pull request #16893 from paultrudel/upgrade-asset-pipeline-dependency
fix(sec): Upgrade asset-pipeline-gradle dependency to 4.0.0
2023-03-02 15:06:28 -05:00
Anton Georgiev
3b6ea98dba
Merge pull request #16894 from paultrudel/upgrade-fileupload-dependency
fix(sec): Upgrade file upload dependency
2023-03-02 15:01:23 -05:00
Paul Trudel
1eb19907d4 Upgraded embedded tomcat version 2023-03-02 18:35:03 +00:00
Paul Trudel
d5dbd6ea5e Upgraded file upload dependency 2023-03-02 18:27:25 +00:00
Paul Trudel
6b2cf96fed Upgraded asset pipeline dependency 2023-03-02 18:19:36 +00:00
Gustavo Trott
895f3639b5
Merge pull request #16769 from GuiLeme/issue-16734 2023-02-27 15:19:38 -03:00
GuiLeme
cfdff618fc [issue-16734] - Changes in review 2023-02-27 12:45:04 -03:00
GuiLeme
661ab05bfa [issue-16734] - changes in review 2023-02-24 12:52:01 -03:00
Paul Trudel
73ecc786aa Added comment to config property 2023-02-24 15:50:44 +00:00
Paul Trudel
c4da4e8416 Changed config setting name to allowFetchAllRecordings 2023-02-24 15:48:53 +00:00
GuiLeme
d47d586f0e [issue-16734] - refactor disabledFeatures presentationArea to just presentation 2023-02-22 17:16:43 -03:00
Paul Trudel
6cd625933f Added new bbb property to control get all recordings 2023-02-21 16:32:32 +00:00
GuiLeme
421717a817 [issue-16734] - patch for error handling 2023-02-21 08:41:05 -03:00
GuiLeme
cbe3e88938 [issue-16734] - Implemented new disabledFeature presentationArea 2023-02-17 12:44:36 -03:00
GuiLeme
ce50e00cef [issue-13867] - remove and related settings 2023-01-31 10:30:55 -03:00
Anton Georgiev
0b06e17744
Merge pull request #16570 from GuiLeme/fix-meetingId-not-trim-error
fix: Fix error when meetingID is not trimed.
2023-01-26 14:59:14 -05:00
Guilherme Pereira Leme
0e0123a03e
changes in review
Co-authored-by: Gustavo Trott <gustavo@trott.com.br>
2023-01-26 14:26:15 -03:00
GuiLeme
e3efc2929f [fix-meetingId-not-trim-error] - add validation 2023-01-26 12:05:42 -03:00
Anton Georgiev
8522a422ad
Merge pull request #16563 from antobinary/sec-4
fix(sec): bump postgresql to 42.4.3
2023-01-25 16:35:15 -05:00
Anton Georgiev
471aac419b
Merge pull request #16560 from antobinary/sec-1
fix(sec): bump nuProcess to 2.0.6
2023-01-25 16:28:18 -05:00
Anton Georgiev
dbd3accfe2
fix(sec): bump nuProcess to 2.0.6 2023-01-25 14:32:29 -05:00
Anton Georgiev
71ed975c0d fix(sec): bump postgresql to 42.4.3 2023-01-25 19:09:22 +00:00
Anton Georgiev
17184f3f1f refactor: tweaks on recording-imex to get it to run locally 2023-01-25 18:19:01 +00:00
Anton Georgiev
fe94d9f4b3 fix(sec): Bump up grails web-boot and plugin-rest 2023-01-25 01:30:40 +00:00
Anton Georgiev
b66d097458 Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into jan-24-merge 2023-01-25 00:40:43 +00:00
Anton Georgiev
5ea43ff15c
Merge pull request #15457 from schrd/fix-issue-15436
Fix: use grails configuration for CORS settings
2023-01-23 16:54:55 -05:00
Anton Georgiev
d7da9f7aba
Merge pull request #16060 from gustavotrott/api-enter-meeting-ended-error
refactor: Improve error message on meeting or session invalid
2023-01-23 16:49:28 -05:00
Bohdan Zhemelinskyi
605af26d41 specify version of snakeYML to upgrade 2023-01-20 19:12:45 +00:00
Anton Georgiev
8e37b8b95d
fix(sec): upgrade databinding to 5.2.4 (port of #16522) 2023-01-20 13:22:50 -05:00
Bohdan Zhemelinskyi
8ffa975f0e upgrade databinding to 5.2.4 2023-01-20 16:19:29 +00:00
Anton Georgiev
129d419c6f
Merge pull request #16513 from paultrudel/recording-pagination-changes
refactor(api): Recording pagination changes
2023-01-20 10:24:03 -05:00
Paul Trudel
f7fe6b9b5d Modified pagination functionality 2023-01-18 21:22:10 +00:00
Daniel Petri Rocha
a6b589a069 Add captured filename as breakout property 2023-01-16 23:00:27 +01:00
Anton Georgiev
349dd8b193 fix: move allowDuplicateExtUserid to bbb properties 2023-01-12 22:04:52 +00:00
Anton Georgiev
0bc3af0f58 Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into merge-jan-12 2023-01-12 21:58:07 +00:00
Anton Georgiev
25f7d34c4e
Merge pull request #15676 from danimo/bbb-web-defaults
chore(bbb-web): do away with wrapper script, use default files
2023-01-12 15:59:55 -05:00
Anton Georgiev
58134f4d88
Update bigbluebutton-web/grails-app/conf/bigbluebutton.properties 2023-01-09 13:11:41 -05:00
Bohdan Zhemelinskyi
0aa63e3c43 patch for default value in xml 2023-01-09 17:51:01 +00:00
GuiLeme
78b165ed7c Merge remote-tracking branch 'upstream/v2.6.x-release' into disabled-transcriptions 2023-01-09 10:58:25 -03:00
GuiLeme
f67f530b32 [disabled-transcription] - Renamed audioCaptions to liveTranscription (for disabledFeatures) 2023-01-09 10:47:22 -03:00
Anton Georgiev
2092b1dfed Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into merge-jan-5 2023-01-05 20:26:36 +00:00
Bohdan Zhemelinskyi
f5b1795913 fix forgotten change 2023-01-05 19:11:22 +00:00
Anton Georgiev
3a74c2bec1 Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2510-to-26 2023-01-05 18:30:09 +00:00
Anton Georgiev
2ce3451404
Merge pull request #16397 from zhem0004/grailsUpgradeBackport
chore: Grails upgrade to 5.2.4
2023-01-05 13:12:07 -05:00
Bohdan Zhemelinskyi
b21cae5f1a Merge branch 'v2.5.x-release' of https://github.com/bigbluebutton/bigbluebutton into grailsUpgradeBackport 2023-01-05 14:36:21 +00:00
Anton Georgiev
55fe868a27 refactor: fix indentation in core 2023-01-05 11:24:42 +00:00
Anton Georgiev
15c6a00b92
Merge pull request #16388 from zhem0004/upgradeGrailsAndSpringON25
fix: Upgrade spring to 2.7.x (backport)
2023-01-05 06:17:20 -05:00
Bohdan Zhemelinskyi
43a0c443b4 upgrade in common-web 2023-01-04 20:57:41 +00:00
Bohdan Zhemelinskyi
3b27ab1447 upgrade grails to 5.2.4 2023-01-04 20:56:05 +00:00
Bohdan Zhemelinskyi
f95270c98c spring to 2.7.x 2023-01-04 20:33:06 +00:00
Anton Georgiev
9e306a6752
fix: Bump bbb-common-message version 2022-12-29 12:28:56 -05:00
Anton Georgiev
452aef5fd9
fix: Bump bbb-common-message version #16185 2022-12-29 12:23:14 -05:00
Anton Georgiev
47c60254ca
Merge pull request #15741 from prlanzarin/u26/feat/web-defaultHttpSessionTimeout
feat(bbb-web): make HTTP session timeout configurable
2022-12-22 12:48:13 -05:00
Anton Georgiev
8276397d2d
chore: Upgrade commons-compress to 1.21 2022-12-21 05:47:12 -05:00
Anton Georgiev
49738b18a1
chore: Upgrade commons-compress to 1.21 2022-12-21 05:41:18 -05:00
GuiLeme
b4afec689e [disabled-transcription] - Created new disabledFeature audioCaptions 2022-12-16 17:04:14 -03:00
KDSBrowne
09eb68f23b add lock setting for viewer annotations 2022-12-12 23:26:03 +00:00
Bohdan Zhemelinskyi
b5374f5b28 bump up tomcat 2022-12-08 23:18:20 +00:00
Bohdan Zhemelinskyi
c8922803ec upgrade tomcat 2022-12-08 20:37:17 +00:00
Gustavo Trott
0c56df9ac8 Revert constrants key names to previous names 2022-11-25 16:17:28 -03:00
Gustavo Trott
445a35a331 Add exception to accept ppt with pptx mime 2022-11-25 09:51:34 -03:00
Gustavo Trott
13e71ac6c4 Improve API /enter error on session ended 2022-11-24 10:17:48 -03:00
GuiLeme
5391bd1a83 [fix-check-mime-insert-document] - changes in review 2022-11-23 09:22:35 -03:00
GuiLeme
058bbb039b [fix-check-mime-insert-document] - add validation to front-end 2022-11-22 17:41:57 -03:00
GuiLeme
5c41f53d0b Merge remote-tracking branch 'upstream/v2.6.x-release' into fix-check-mime-insert-document 2022-11-22 08:47:54 -03:00
Gustavo Trott
0113d35f87 Add code improvements 2022-11-21 23:29:23 -03:00
GuiLeme
041d964932 [fix-check-mime-insert-document] - Changes in review 2022-11-21 14:52:08 -03:00
GuiLeme
cf70ea39ae [fix-check-mime-insert-document] - changes in review 2022-11-18 17:20:44 -03:00
Gustavo Trott
17a16eced5
Merge pull request #16022 from gustavotrott/presentation-refactor 2022-11-18 16:31:00 -03:00
Gustavo Trott
7781909d50 Removes all references to swf files (used by old flash client) 2022-11-17 10:55:19 -03:00
Gustavo Trott
7d4e50993f
Merge pull request #15993 from gustavotrott/fix-getMeetingInfo-participantCount
Closes https://github.com/bigbluebutton/bigbluebutton/issues/13394
2022-11-15 22:33:55 -03:00
Gustavo Trott
531241d269
feat: Button to transfer user to mobile App (#15183)
* Provide a link to transfer user to mobile App
* show menu option only if appStoreLink is present and it is not running on mobile app already
2022-11-15 09:49:24 -03:00
Gustavo Trott
f5e1d94245 Make API participantCount show online users 2022-11-11 14:14:55 -03:00
GuiLeme
40e2f22473 [fix-check-mime-insert-document] - fix response when meeting doesn't exist 2022-11-11 09:42:39 -03:00
GuiLeme
a10e6f5505 [fix-check-mime-insert-document] - validation of mimetypes and deletion of wrongly downloaded files. 2022-11-11 09:07:46 -03:00
Gustavo Trott
6f5c1eb722
Merge pull request #15960 from gustavotrott/presentation-slide-validation 2022-11-10 15:38:11 -03:00
Gustavo Trott
c9ddd971f5
Merge pull request #15857 from gustavotrott/max-users-improvements
Closes https://github.com/bigbluebutton/bigbluebutton/issues/9354
2022-11-07 21:24:07 -03:00
Gustavo Trott
6922bb6f99 Include presentation mapping constraints 2022-11-07 17:16:27 -03:00
Gustavo Trott
b6e66ce2b1
Merge pull request #15932 from zhem0004/semiBackportUpdates 2022-10-31 15:40:55 -03:00
Gustavo Trott
7530ac8019 Add mavenCentral as replacement for jcenter 2022-10-31 14:51:01 -03:00
Gustavo Trott
033e9e6340 Add mavenCentral as replacement for jcenter 2022-10-31 14:34:27 -03:00
Gustavo Trott
13503b1db8 Removes JCenter from repositories list as it is failing 2022-10-31 11:13:49 -03:00
Gustavo Trott
317d9bc353 Removes JCenter from repositories list as it is failing 2022-10-31 09:58:01 -03:00
Gustavo Trott
09697948e1
Merge pull request #15708 from danielpetri1/breakout-upload-ui 2022-10-31 08:29:56 -03:00
Gustavo Trott
f747b82d47 Improve validation of maxParticipants on akka-apps side 2022-10-26 13:19:16 -03:00
Bohdan Zhemelinskyi
a0ddd9d178 upgrade dependencies 2022-10-25 15:08:04 +00:00
Daniel Petri Rocha
a8587d53b8 Merge branch 'v2.6.x-release' into breakout-upload-ui 2022-10-25 16:13:24 +02:00
Gustavo Trott
e2f9b19afc Merge remote-tracking branch 'upstream/v2.6.x-release' into max-users-improvements 2022-10-24 22:48:38 -03:00
Bohdan Zhemelinskyi
bae06f588e presentation allow null 2022-10-24 15:35:30 +00:00
Ramón Souza
8ed142a522 Merge remote-tracking branch 'upstream/v2.5.x-release' into merge-258-26 2022-10-21 14:43:23 -03:00
Gustavo Trott
86000eb851
Update bigbluebutton-web/grails-app/conf/bigbluebutton.properties 2022-10-21 09:09:58 -03:00
Gustavo Trott
48fda8f3b2
Update bigbluebutton-web/grails-app/conf/bigbluebutton.properties 2022-10-21 09:09:42 -03:00
Paul Trudel
c5f234ddf4 Fixed issue with checksum algorithms 2022-10-21 06:50:23 +00:00
Gustavo Trott
245e67f418 Fix a problem where presentations is always null 2022-10-20 15:12:10 -03:00
Gustavo Trott
37fc589f71 Instruction to disable default presentation 2022-10-19 18:18:41 -03:00
Bohdan Zhemelinskyi
2ee70c671d set default as null 2022-10-19 20:17:53 +00:00
Bohdan Zhemelinskyi
927d97fc30 Merge branch 'defaultPresentationNull' of https://github.com/zhem0004/bigbluebutton into defaultPresentationNull 2022-10-19 19:39:09 +00:00
Daniel Petri Rocha
0a2b4186a2 Merge branch 'v2.6.x-release' into breakout-upload-ui 2022-10-19 19:51:05 +02:00
Gustavo Trott
a9fe2cf18d
Merge pull request #15755 from danielpetri1/capture-shared-notes 2022-10-18 14:19:29 -03:00
Gustavo Trott
65489e9c04
Merge pull request #15859 from zhem0004/upgradeZ 2022-10-18 13:14:26 -03:00
Bohdan Zhemelinskyi
e1c019eb65 unset null 2022-10-18 15:06:22 +00:00
Bohdan Zhemelinskyi
2e11b884f7 Merge branch 'v2.6.x-release' of https://github.com/bigbluebutton/bigbluebutton into defaultPresentationNull 2022-10-18 14:58:09 +00:00
Bohdan Zhemelinskyi
35ed3228ef set defaultPresentation-null 2022-10-18 14:57:54 +00:00
Gustavo Trott
80ffb26fff Implements maxUserConcurrentAccesses and change participants count logic 2022-10-17 17:30:53 -03:00
GuiLeme
bc9f24a5fb [backport-pdf-100] - backport of functionality 2022-10-17 17:05:16 -03:00
Daniel Molkentin
02891cf320 chore(bbb-web): do away with wrapper script, use default files 2022-10-11 19:45:26 +02:00
Daniel Petri Rocha
f170bdc19b Merge branch 'v2.6.x-release' into capture-shared-notes 2022-10-06 22:38:21 +02:00
Gustavo Trott
9c185a52f4
Merge pull request #15782 from GuiLeme/remove-none-from-properties 2022-10-06 17:05:47 -03:00
Bohdan Zhemelinskyi
02409967d8 upgrade 2022-10-06 14:07:16 +00:00
GuiLeme
5ca4a92940 [issue-pdf-100-processing] - resolved conflicts 2022-10-06 09:58:42 -03:00
GuiLeme
c9b42a230e Merge branch 'issue-pdf-100-processing' of github.com:GuiLeme/bigbluebutton into issue-pdf-100-processing 2022-10-06 08:18:57 -03:00
Gustavo Trott
ec9bad1287
Merge pull request #15762 from zhem0004/removeSetPollsXML 2022-10-05 12:02:39 -03:00
GuiLeme
094c99029f [remove-none-from-properties] - commented line 2022-10-05 11:26:42 -03:00
Guilherme Pereira Leme
42da2a7a8c
[issue-pdf-100-processing] - Changes in review
Co-authored-by: Gustavo Trott <gustavo@trott.com.br>
2022-10-04 17:01:06 -03:00
Bohdan Zhemelinskyi
fd1df3cc47 add parameter to run script 2022-10-03 15:02:20 +00:00
Daniel Petri Rocha
234e36f462
Merge branch 'v2.6.x-release' into breakout-upload-ui 2022-10-03 11:05:23 +02:00
Daniel Petri Rocha
26a93f6853
Merge branch 'v2.6.x-release' into capture-shared-notes 2022-10-03 11:03:24 +02:00
Gustavo Trott
9a18f5fe61
Merge pull request #15467 from zhem0004/spring2726 2022-09-30 17:29:56 -03:00
Bohdan Zhemelinskyi
adcd139ec0 remove SetPollsXML 2022-09-30 14:24:09 +00:00
GuiLeme
362371834a Merge remote-tracking branch 'upstream/v2.6.x-release' into issue-pdf-100-processing 2022-09-30 10:34:23 -03:00
Bohdan Zhemelinskyi
dc9aebc91e Doc conversion service fix 2022-09-28 18:46:28 +00: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
Ramón Souza
2b0971e2c8 Merge tag 'v2.5.6' into merge-256-26 2022-09-26 09:17:59 -03:00
GuiLeme
633a032fd0 [issue-pdf-100-processing] - implemented retry flow and fixed error message 2022-09-22 16:58:37 -03:00
Bohdan Zhemelinskyi
06eb9dd246 treat property file as optional 2022-09-21 17:40:26 +00:00