Commit Graph

767 Commits

Author SHA1 Message Date
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
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
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