BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,968 Commits 13 Branches 260 Tags 1.1 GiB
394f01bf9f
Commit Graph

2017 Commits

Author SHA1 Message Date
Gustavo Trott
6dc3dbb1fe
Merge pull request #19104 from gustavotrott/graphql-user-join-action 
graphql: New User Flow for Joining Meetings via GraphQL
 2023-11-15 09:16:02 -03:00
Gustavo Trott
7c0a1649d7
Merge pull request #19129 from Scroody/fix_isbreakout_api 
fix: check for presence of parentMeetingID if isBreakout is true
 2023-11-15 08:34:22 -03:00
Gustavo Trott
57aab3d049 Fix hasPresentationUrlInParameter 2023-11-14 13:21:33 -03:00
Jan Kessler
bd7d956ec9 fix: check for presence of parentMeetingID if isBreakout is true 2023-11-14 13:12:29 -03:00
Guilherme Pereira Leme
6af3d4fae0 feature (api): Add preUploadedPresentation param to API's /create via GET 2023-11-13 13:16:02 -03:00
Gustavo Trott
5f0a1aa339 Let user join the meeting using Graphql actions 2023-11-10 17:36:10 -03:00
Gustavo Trott
8f0ecf2d63 Insert presentation on UploadTokenReq 2023-11-01 11:38:19 -03:00
Guilherme Pereira Leme
4ef078ccf5
feature: Override client settings through API /create call (#18782) 
* akka-with-client-configs

* [akka-with-client-configs] -  inserted client configs in akka

* [issue-18588-create-override] - WIP

* [akka-with-client-configs] - Remove unnecessary code

* [issue-18588] - test some thesis

* [akka-with-client-configs] - refactor to add jackson and immutable.Map

* [issue-18588-create-override] - new architecture for overriding client configs]

* [issue-18588-create-override] - implemented settings

* Refactor on clientSettingsOverride module and add allowOverrideClientSettingsOnCreateCall conf

---------

Co-authored-by: Gustavo Trott <gustavo@trott.com.br>
 2023-10-10 21:00:20 -03:00
Gustavo Trott
524443c4c3 graphql: Apply hideViewerCursor and hideViewersAnnotation 2023-10-03 11:53:47 -03:00
Gustavo Trott
fff883b2b2 Merge 2.7 into 3.0 2023-09-27 08:44:37 -03:00
Paul Trudel
c115dd1f67 Finished switch from Akka to Pekko 2023-09-01 15:52:12 +00:00
GuiLeme
0aacb12cc8 [issue-18408-back-end] - added disabled download of converted presentation 2023-08-25 11:37:32 -03:00
GuiLeme
2cf6720b5f [issue-18408-back-end] - change name of download original pres 2023-08-25 09:27:01 -03:00
Gustavo Trott
baba92cb0f Merge 2.7 into Develop 2023-08-04 16:47:23 -03:00
Ramón Souza
4b6686ef76 add comment 2023-07-31 17:07:41 -03:00
Gustavo Trott
3758dd89e2 Merge 2.7 into Develop 2023-07-31 11:24:25 -03:00
Anton Georgiev
6b76d9aa66 Merge remote-tracking branch 'bbb/v2.6.x-release' into merge-july-21 2023-07-21 16:24:45 -04:00
Gustavo Trott
0771bf7c29 Update Go and Hasura versions 2023-07-18 15:03:37 -03:00
Paul Trudel
fea3a6fb1e Upgraded tomcat to 9.0.78 2023-07-17 11:10:10 +00:00
Gustavo Trott
5681e88c60 Merge 2.7 into Develop 2023-06-26 17:21:01 -03:00
Gustavo Trott
74c81e080b Provide presentation data through graphql 2023-06-26 09:46:54 -03:00
Anton Georgiev
3610ca53e6
Merge pull request #18154 from paultrudel/java-17-upgrade 
build: Java 17 support
 2023-06-15 07:48:26 -04:00
Anton Georgiev
a962a44c74 Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into june14merge 2023-06-14 10:07:54 -04:00
Paul Trudel
e6335ae8d0 Upgrade gorm and groovy versions 2023-06-13 15:02:56 +00:00
Gustavo Trott
22a2c8ce7c Merge remote-tracking branch 'upstream/v2.7.x-release' into graphql-timer 2023-06-12 10:06:22 -03:00
Paul Trudel
b43d46091c Fully remove dependency 2023-06-08 17:35:12 +00:00
Paul Trudel
299ffd49fa Remove commons-fileupload dependency 2023-06-08 17:30:57 +00:00
Anton Georgiev
49d48c0945
Merge pull request #18097 from ramonlsouza/16120 
feat: Add Lock Setting For Viewer Annotations
 2023-06-08 11:12:22 -04:00
Anton Georgiev
411ac84cf7
Merge pull request #18030 from danielpetri1/mime-fixes 
refactor(bbb-web): Use Tika as MIME type detection tool
 2023-06-07 12:41:53 -04:00
Anton Georgiev
b699a46802
Merge pull request #17975 from paultrudel/breakout-room-exception-fix 
fix: Added check for parentMeetingId if isBreakout is true
 2023-06-06 09:35:04 -04:00
Anton Georgiev
1146ab9be9 Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into merge-26-27-june-6 2023-06-06 09:28:53 -04:00
Ramón Souza
22b02ead28 Merge remote-tracking branch 'upstream/v2.7.x-release' into 16120 2023-06-06 08:45:29 -03:00
Daniel Petri Rocha
d2762657ee
Merge branch 'v2.6.x-release' into mime-fixes 2023-06-06 12:12:13 +02:00
danielpetri1
ffeb8c3acb Allow multiple MIME types per extension 2023-06-06 10:08:14 +00:00
Anton Georgiev
70b3220f41 Merge branch 'v2.7.x-release' of github.com:bigbluebutton/bigbluebutton into june5-27 2023-06-05 17:09:35 -04:00
Paul Trudel
fe43eba452 Allow default presentation to bypass localhost check 2023-06-05 14:32:25 +00:00
Anton Georgiev
748c7a4a0b Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into june227 2023-06-02 09:45:34 -04:00
Anton Georgiev
e92862ee00
Merge pull request #17986 from paultrudel/meeting-info-attendee-update 
fix(Meeting API): Only include online users in attendee list
 2023-05-31 18:29:14 -04:00
Anton Georgiev
b18aff32e6
Merge pull request #18045 from paultrudel/ssrf-fix 
fix(sec): SSRF fix
 2023-05-31 18:19:40 -04:00
prlanzarin
4d1aa87a88 feat: only record media while meeting is being actively recorded 
Only record media (microphone, webcams and screens) while meeting is
being actively recorded (ie an user has enabled recording in the
conference). If the conference's recording is paused, media capture will
stop as well (with appropriate recording events).

A bigbluebutton.properties/API#create parameter called
`recordFullDurationMedia` is added to control this behavior. The default
is false (only capture while recording is active). Setting it to `true`
enables the current (legacy) behavior: always capture media if the
meeting's `recorded` prop is true.
 2023-05-31 16:36:11 -03:00
Paul Trudel
08a87f2dad Changed names of presentation download properties and set https as default 2023-05-30 14:02:13 +00:00
danielpetri1
cf9c0899d0 Use Tika as MIME detection tool 2023-05-29 13:19:49 +00:00
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