Gustavo Trott
51bdcededc
Merge 2.7 into develop
2023-05-26 10:50:39 -03:00
Anton Georgiev
eae28eb702
Merge pull request #18009 from paultrudel/upgrade-grails-26
...
fix(sec): Upgrade grails-core
2023-05-25 19:52:35 -04:00
Anton Georgiev
3826018735
Merge pull request #18010 from paultrudel/upgrade-spring-webmvc-26
...
fix(sec): Upgrade spring-webmvc
2023-05-25 19:51:35 -04:00
Anton Georgiev
f0cb2e4bb8
Merge branch 'v2.6.x-release' into upgrade-tomcat-26
2023-05-25 19:50:57 -04:00
Anton Georgiev
ac365d9ad9
Merge pull request #18007 from paultrudel/upgrade-spring-26
...
fix(sec): Upgrade Spring
2023-05-25 19:49:49 -04:00
Paul Trudel
81164c4e1c
Upgraded spring-webmvc to 5.3.27
2023-05-25 20:22:07 +00:00
Paul Trudel
6833a126f0
Upgraded grails-core to 5.3.2
2023-05-25 20:20:49 +00:00
Paul Trudel
b2b952326a
Upgraded tomcat to 9.0.74
2023-05-25 20:19:30 +00:00
Paul Trudel
b2f2ec7379
Upgrades spring to 2.7.12
2023-05-25 20:16:14 +00:00
Paul Trudel
9cc1a43816
Upgraded org.json
2023-05-25 20:14:25 +00:00
Anton Georgiev
25af259d2d
Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into merge-may-24
2023-05-24 17:23:00 -04:00
Paul Trudel
b641c6313a
Only include online users in attendee list
2023-05-24 19:58:16 +00:00
Paul Trudel
9840e6630f
Added check for parentMeetingId if isBreakout is true
2023-05-23 19:34:34 +00:00
Paul Trudel
de58b4ceec
Added condition to check if no passwords are provided
2023-05-17 18:35:05 +00:00
GuiLeme
1b26302745
[issue-17531] - merge upstream/v2.7.x-release
2023-05-16 15:30:15 -03:00
Anton Georgiev
510c94cfa7
Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into may16-merge
2023-05-16 13:35:47 -04:00
Paul Trudel
575ff77261
Added localhost to blocked hosts
2023-05-16 15:17:30 +00:00
Gustavo Trott
e5f31e2f0b
Add user customParameters to graphql
2023-05-15 17:21:36 -03:00
Ramón Souza
dcef3e3d7b
Merge pull request #17845 from ramonlsouza/issue-17839
...
fix: ignore restore on update for first load of initial presentation
2023-05-15 13:41:27 -03:00
Anton Georgiev
4e851a7571
Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into merge-267-27
2023-05-15 11:51:17 -04:00
Gustavo Trott
6b28de2c9c
This part seems to be outdated and not necessary since 61d7b18345
2023-05-15 11:46:44 -03:00
Paul Trudel
8fd1d52e62
All protocols are supported now by default
2023-05-10 19:22:28 +00:00
Anton Georgiev
706eb4e762
Merge pull request #17844 from paultrudel/unreleased-streams-fix
...
fix(sec): Unreleased streams fix
2023-05-10 10:47:37 -04:00
GuiLeme
163017c90a
[issue-17738] - patch
2023-05-09 15:09:13 -03:00
Paul Trudel
7c45ae6207
Added try-catch to stream close
2023-05-09 16:18:20 +00:00
Paul Trudel
6c0915d71b
Initialized file input stream
2023-05-09 15:17:14 +00:00
GuiLeme
d2c5b33eec
[issue-17839] - back-end part for hide_presentation_on_join issue
2023-05-09 12:01:55 -03:00
GuiLeme
90078aedc7
[issue-17531] - resolve conflicts with 2.7
2023-05-04 08:56:27 -03:00
Gustavo Trott
768c4224a1
Resolve conflicts with 2.7 upstream
2023-04-24 18:02:06 -03:00
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