Commit Graph

1951 Commits

Author SHA1 Message Date
Gustavo Trott
baba92cb0f Merge 2.7 into Develop 2023-08-04 16:47:23 -03:00
Gustavo Trott
3758dd89e2 Merge 2.7 into Develop 2023-07-31 11:24:25 -03:00
Gustavo Trott
0771bf7c29 Update Go and Hasura versions 2023-07-18 15:03:37 -03: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