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

905 Commits

Author SHA1 Message Date
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
danielpetri1
74e88d0a28 Remove unused imports 2023-06-07 14:44:02 +00: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
danielpetri1
a2a41b6282 Merge branch 'mime-fixes' of github.com:danielpetri1/bigbluebutton into mime-fixes 2023-06-06 12:09:27 +00:00
danielpetri1
bc090d71bb Permit .docx with .doc content 2023-06-06 12:08:21 +00: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
d9cce76c33 Remove unecessary log 2023-06-05 14:33:52 +00:00
Paul Trudel
fe43eba452 Allow default presentation to bypass localhost check 2023-06-05 14:32:25 +00:00
Paul Trudel
ae11bd43a3 Default presentation exempt from validation 2023-06-05 13:49:47 +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
prlanzarin
9f46b10485 fix: typo when parsing recordFullDurationMedia API param 2023-06-01 15:05:50 -03: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
danielpetri1
ba6b33a83f Don't rely on filename to determine MIME type 2023-05-30 15:59:58 +00: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
Paulo Lanzarin
171c7a6587
Merge branch 'v2.7.x-release' into v2.7.x-release 2023-05-26 09:27:14 -03: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
e7bc91d389 Upgrade spring validation library to 2.7.12 2023-05-25 20:16:28 +00:00
Anton Georgiev
7585f99352 feat: introduce disableFeaturesExclude CREATE API param 2023-05-25 15:43:30 -04:00
Paul Trudel
b641c6313a Only include online users in attendee list 2023-05-24 19:58:16 +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
Paul Trudel
82f6c3022e Changed log level of protocol warning 2023-05-12 15:55:29 +00:00
GuiLeme
89eafc6315 [issue-17531] - changes in review 2023-05-12 12:40:07 -03:00
GuiLeme
4c2806a018 [issue-17531] - changes in review and ES-lint fixes 2023-05-11 18:06:48 -03:00
Paul Trudel
8fd1d52e62 All protocols are supported now by default 2023-05-10 19:22:28 +00:00
Anton Georgiev
ba8aa3468f
Merge pull request #17860 from ramonlsouza/issue-17840 
fix: Learning dashboard is available in breakout rooms
 2023-05-10 11:45:01 -04: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
Gustavo Trott
e6cd0e1696
make validation about Learning Dashboard more readable 2023-05-10 09:46:12 -03:00
Ramón Souza
c0cf3502d2 disable learning dashboard for breakout rooms 2023-05-10 09:17:02 -03:00
GuiLeme
163017c90a [issue-17738] - patch 2023-05-09 15:09:13 -03: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
54242ec176 [issue-17531] - Deleted original presentation when it is not already a pdf or an image 2023-05-02 16:26:35 -03:00
GuiLeme
f03c01399f [issue-17531] - added ConvertedPresentationName to be referenced when getting the link to downloading the original file 2023-05-02 11:14:40 -03:00
Paul Trudel
1b5015211e Change registeredUser joined to false after leave 2023-04-26 15:41:29 +00:00
Lucas Fialho Zawacki
fee6ff026a feat(captions): Use setUserSpeechLocale as an akka event and catch it in the transcription manager 2023-04-25 09:54:34 -03:00
Paul Trudel
c378ffe4a9 Added new properties for supported protocols and blocked hosts 2023-04-21 15:29:19 +00:00
Paul Trudel
9e7ceb7b84 Added additional url validation checks for presentation upload 2023-04-20 19:53:08 +00:00
GuiLeme
6e05e3ca51 [issue-17131] - Suggestions in review and some change of behavior 2023-04-20 08:48:43 -03:00
Paul Trudel
68a0623f6c Added initial url validation check to presentation upload 2023-04-19 21:03:52 +00:00
Paul Trudel
503fb49bbe Use reader in XML.load 2023-04-17 16:58:02 +00: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
Gustavo Trott
63bc1593d5 Apply locksettings-hideUserList as validation on fetch users in Hasura 2023-04-12 11:07:54 -03:00
Paul Trudel
8550d7f0ee Removed unused part of CallbackUrlService 2023-04-04 18:56:41 +00:00
Paul Trudel
b55d152d2c Removed ClientConfigService from bbb-web 2023-03-31 13:24:02 +00:00
Paul Trudel
77cb702cd1 Ignore case on available check 2023-03-20 18:39:43 +00:00
Paul Trudel
28780f8f21 Handle available status in bbb-common-web 2023-03-20 18:38:24 +00:00
Paul Trudel
87b4c3795b Retrieve meetingIDs from meta tag if no meeting tag exists 2023-03-20 18:23:27 +00:00
Paul Trudel
5de1eed038 Added error message when guest is denied access to meeting 2023-03-09 20:57:26 +00:00
Paul Trudel
9586b2f644 Removed glassfish el dependency 2023-03-02 18:09:21 +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
Anton Georgiev
d8b768d396
Merge pull request #16770 from paultrudel/getrecordings-return-all 
refactor (bbb-web): getRecordings - introduce new config allowFetchAllRecordings
 2023-02-27 10:38:05 -05:00
GuiLeme
77e1c09197 [remove-frequently-logged-message] - Remove frequent log 2023-02-24 15:54:49 -03:00
GuiLeme
661ab05bfa [issue-16734] - changes in review 2023-02-24 12:52:01 -03: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
Anton Georgiev
64c3c44d06
Merge pull request #16674 from paultrudel/checksum-ignore-case 
fix(bbb-web): Case Insensitive Checksum Validation
 2023-02-13 09:46:22 -05:00
GuiLeme
3e6bb32a45 Merge remote-tracking branch 'upstream/v2.6.x-release' into issue-13867 2023-02-08 11:41:10 -03:00
Paul Trudel
2a0c0819fa Modified checksum validation to be case insensitive 2023-02-07 19:42:15 +00:00
Paul Trudel
62102a84a8 Modified PG startup script and added volume 2023-02-03 20:37:45 +00:00
Gustavo Trott
2159032556
Merge pull request #16620 from paultrudel/multi-user-join-issue 2023-02-02 11:55:40 -03:00
Paul Trudel
08e00c0aef Changed timing to update on regiesteredUser guest status 2023-02-01 17:49:14 +00:00
Gustavo Trott
71b78d5d9e
Merge pull request #16583 from GuiLeme/detect-mime-improvements 2023-01-31 13:17:26 -03:00
Gustavo Trott
e654ad0477 Use method getContentTypeFor to detect mimeType as alternative when failed using file 2023-01-31 11:05:14 -03:00
GuiLeme
ce50e00cef [issue-13867] - remove and related settings 2023-01-31 10:30:55 -03:00
GuiLeme
8aebe9734b [detect-mime-improvements] - changes in review 2023-01-30 17:39:02 -03:00
GuiLeme
d43d95dbc8 [detect-mime-improvements] - changes in review 2023-01-30 16:06:09 -03:00
GuiLeme
56dcf608e4 [detect-mime-improvements] - don't validate mime if there is no command, and enhance log's informations 2023-01-27 11:07:51 -03:00
Gustavo Trott
701a355ef2
Merge pull request #16571 from paultrudel/multi-user-join-issue 2023-01-26 16:46:56 -03:00
Paul Trudel
cda9c06da4 Added some additional logs for user authentiction and purging 2023-01-26 19:25:36 +00:00
Anton Georgiev
f024171671 fix(sec): bump jackson to 2.13.5 2023-01-25 22:44:28 +00: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
239716c1c0
Update bbb-common-web/src/main/java/org/bigbluebutton/api/model/entity/Metadata.java 2023-01-25 14:35:29 -05:00
Anton Georgiev
5c01562e60
fix(sec): bump nuProcess to 2.0.6 2023-01-25 14:31:48 -05:00
Anton Georgiev
71ed975c0d fix(sec): bump postgresql to 42.4.3 2023-01-25 19:09:22 +00:00
Anton Georgiev
f3751c7364 fix(sec): bump postgresql to 42.4.1 2023-01-25 18:49:34 +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
881c6c4685 fix(sec): bump nuProcess to 2.0.5 2023-01-25 15:15:45 +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
0ee382c493 Modified database retrieval of recordings 2023-01-19 15:23:54 +00: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
Daniel Petri Rocha
da6f5d996e Merge branch 'v2.6.x-release' into capture-content-iff-necessary 2023-01-14 13:43:38 +01:00
Daniel Petri Rocha
feaaff2eee Prevent export in send to chat if no annotations available 2023-01-10 13:46:54 +01: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
43a0c443b4 upgrade in common-web 2023-01-04 20:57:41 +00:00
Bohdan Zhemelinskyi
f95270c98c spring to 2.7.x 2023-01-04 20:33:06 +00:00
Anton Georgiev
c0626900fe
Merge pull request #15679 from ramonlsouza/rename-external-pres-params 
refactor: rename external upload parameters
 2022-12-22 13:00:52 -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
657473e0d6 chore: upgrade scala 2.13.4 -> 2.13.9 2022-12-20 21:30:49 +00:00
Anton Georgiev
a1b7d3a963
Merge pull request #16185 from antobinary/scala 
chore: upgrade scala 2.13.4 -> 2.13.9
 2022-12-20 15:22:22 -05:00
Anton Georgiev
a8d64e94d6 chore: upgrade scala 2.13.4 -> 2.13.9 2022-12-20 16:07:08 +00:00
Bohdan Zhemelinskyi
7b9fd22715 add trim to name param 2022-12-15 15:28:23 +00:00
Ramón Souza
064b554dfd Merge remote-tracking branch 'upstream/v2.5.x-release' into merge-2526-dec14 2022-12-14 13:23:11 -03:00
KDSBrowne
09eb68f23b add lock setting for viewer annotations 2022-12-12 23:26:03 +00:00
Gustavo Trott
445a35a331 Add exception to accept ppt with pptx mime 2022-11-25 09:51:34 -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
defc2835a1
Update bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java 
Co-authored-by: Guilherme Pereira Leme <69865537+GuiLeme@users.noreply.github.com>
 2022-11-18 12:46:23 -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
Joao Victor
6c11e1a1d1 fix(presentation conversion): downscale large images 2022-11-11 17:09:38 -03:00
Gustavo Trott
f5e1d94245 Make API participantCount show online users 2022-11-11 14:14:55 -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
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
1c7ccdc24f
Merge pull request #15733 from BrentBaccala/lookup-parentmeetingid 2022-11-07 21:16:33 -03:00
Gustavo Trott
454d394158 Renames functions name to avoid misunderstanding 2022-10-31 08:17:46 -03:00
Gustavo Trott
c0644c25a1 Renames functions name to avoid misunderstanding 2022-10-31 08:13:22 -03:00
Gustavo Trott
f747b82d47 Improve validation of maxParticipants on akka-apps side 2022-10-26 13:19:16 -03: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
Ramón Souza
69c0616000 resolve conflict 2022-10-21 15:04:34 -03: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
Paul Trudel
c5f234ddf4 Fixed issue with checksum algorithms 2022-10-21 06:50:23 +00:00
Gustavo Trott
06fe8e9f59 Upgrade apacheText version 2022-10-20 10:09:59 -03: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
937650ccf9 Small fixes 2022-10-17 17:38:08 -03: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 Petri Rocha
f170bdc19b Merge branch 'v2.6.x-release' into capture-shared-notes 2022-10-06 22:38:21 +02:00
GuiLeme
5ca4a92940 [issue-pdf-100-processing] - resolved conflicts 2022-10-06 09:58:42 -03:00
Gustavo Trott
ec9bad1287
Merge pull request #15762 from zhem0004/removeSetPollsXML 2022-10-05 12:02:39 -03:00
Gustavo Trott
bbe3ca34a8
Merge pull request #15474 from GuiLeme/apply-toast-shared-notes 2022-10-05 12:02:04 -03: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
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