Commit Graph

924 Commits

Author SHA1 Message Date
Paul
e329dbec1a Check for pressence of query and body 2024-05-16 13:28:49 +00:00
Gustavo Trott
23e8c110b2 Revert wrong removal 2024-05-14 22:25:22 -03:00
Gustavo Trott
429065b245 convet html tags to html entities for guest lobby messages 2024-05-14 11:25:10 -03:00
Gustavo Trott
ba5b44986f remove unsafe tags and add blank target to Welcome msgs 2024-05-14 10:19:30 -03:00
Gustavo Trott
7872712138 rename modOnlyMessage to welcomeMsgForModerators and delete welcomeMsgTemplate 2024-05-14 09:57:58 -03:00
Gustavo Trott
65d22e3b93 rename modOnlyMessage to welcomeMsgForModerators and delete welcomeMsgTemplate 2024-05-14 09:40:51 -03:00
Anton Georgiev
58cdb75c45 refactor: remove html5InstanceId 2024-05-01 12:53:11 -04:00
Gustavo Trott
84b1cd53c5 Fix ident 2024-04-24 18:49:26 -03:00
Gustavo Trott
913a2ffca6 Fix ident 2024-04-24 18:48:07 -03:00
Gustavo Trott
75b72fe662 Fix ident 2024-04-24 18:42:37 -03:00
Gustavo Trott
1723e9d4a8 Add new create param loginURL 2024-04-24 17:40:35 -03:00
Anton Georgiev
ef300cf28e
chore: Fix typo (found by typos) (port) #19834
Co-authored-by: Stefan Weil <sw@weilnetz.de>
2024-03-18 09:58:53 -04:00
Anton Georgiev
5eace35d79
fix(sec): bump postgresql to 42.7.2 (#19663) 2024-02-23 20:11:36 -05:00
Gustavo Trott
ef4773e9e6 Introduces learningDashboard-AccessToken through Graphql 2024-02-20 14:55:54 -03:00
Gustavo Trott
3e72e2d082
Introducing Session Persistence Post-Meeting (#19534)
* Add Session Cleanup Delay Configuration After Meeting End

* Makes 60minutes as default sessionsCleanupDelayInMinutes
2024-02-05 11:31:31 -03:00
Gustavo Trott
cd03c116b0 Add configs from /enter to Graphql 2024-01-24 11:33:38 -03:00
Anton Georgiev
8cf87dbb3e
Merge pull request #19484 from antobinary/ports-02
fix: Bump spring-boot-starter-validation to 2.7.17 to match bbb-web (port from 2.7)
2024-01-23 10:40:27 -05:00
Anton Georgiev
75b57baec7
Merge pull request #19487 from antobinary/ports-05
fix(sec): validate URL for external upload of presentation (port from 2.7)
2024-01-23 10:39:44 -05:00
GuiLeme
554f4f2e2a [GHSA-j42p-fh2w-24q6] - validate URL for external upload of presentation. 2024-01-19 15:44:34 -05:00
Anton Georgiev
7c10f49f4a fix(sec): filter tags in presentation name 2024-01-19 15:42:38 -05:00
Anton Georgiev
6a887c442f fix: Bump spring-boot-starter-validation to 2.7.17 to match bbb-web 2024-01-19 15:38:26 -05:00
Gustavo Trott
5779bc0410
Add a new config graphqlWebsocketUrl in bbb-web.properties (#19433) 2024-01-15 14:12:06 -03:00
Gustavo Trott
c04e6d19e0
refactor (graphql-server): Optimize Hasura Queries with Session Variables (#19347) 2024-01-09 08:31:12 -03:00
Gustavo Trott
d5ea98ec12 Make guest-wait page fetch data from Hasura 2023-12-12 17:42:44 -03:00
Gustavo Trott
399dfa33d1 Undo wrong change 2023-11-20 12:01:53 -03:00
Gustavo Trott
9532d68bad Add new JOIN param enforceLayout 2023-11-20 11:53:53 -03:00
Paul Trudel
b38641ecb5 fix (bbb-web): Null pointer exception when parent meeting does not exist 2023-11-16 09:44:55 -03:00
Gustavo Trott
9628b1790e
Merge pull request #19116 from Scroody/preUploadedPresentation-get-v30
feature (api): Add preUploadedPresentation param to API's /create via GET
2023-11-14 14:44:39 -03:00
Gustavo Trott
57aab3d049 Fix hasPresentationUrlInParameter 2023-11-14 13:21:33 -03:00
Paul Trudel
f9f419cdf1
Refactor: Add chat message to Postgres when user status changes (#18980)
* Insert chat msg on use status change

* Insert system message for user status change

* Close pres file resources

* Remove unused code

* Remove trailing whitespace

* Remove more trailing whitespace

* Use frontend message

* Send user name and add validation

* Fix js errors

* Modify user validation for sending away msg
2023-11-14 10:47:09 -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
8f0ecf2d63 Insert presentation on UploadTokenReq 2023-11-01 11:38:19 -03:00
Gustavo Trott
fb224428e4 refactor update Presentations on Hasura 2023-10-27 17:29:36 -03:00
Paul Trudel
25b334f0de
Update bbb-common-web/src/main/scala/org/bigbluebutton/api2/MsgBuilder.scala
Co-authored-by: Gustavo Trott <gustavo@trott.com.br>
2023-10-18 15:06:28 -04:00
Paul Trudel
99ce048ef7
Update bbb-common-web/src/main/scala/org/bigbluebutton/api2/MsgBuilder.scala
Co-authored-by: Gustavo Trott <gustavo@trott.com.br>
2023-10-18 15:06:21 -04:00
Paul Trudel
8c76b9f652
Merge branch 'v3.0.x-release' into pres-content-from-uri-30 2023-10-17 13:21:41 -04:00
Gustavo Trott
beaa13a841 Close svg source to close connection 2023-10-17 08:15:33 -03:00
Gustavo Trott
a2339a2220 Sanitize the XML content removing DOCTYPE 2023-10-16 22:38:05 -03:00
Paul Trudel
419eb6bf5f Store presentation content in Postgres 2023-10-16 20:05:23 +00:00
Gustavo Trott
c614348305 Adds potrace as requirement for bbb-web and log errors of imagemagick 2023-10-15 22:25:27 -03:00
Paul Trudel
8fe6a015f0 Modify regex to parse decimal numbers 2023-10-13 19:54:50 +00: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
Paul Trudel
20890dc261 Fixed some imports 2023-09-01 20:03:39 +00:00
Paul Trudel
808a520cda Removed Akka dependencies 2023-09-01 18:13:44 +00:00
Paul Trudel
c115dd1f67 Finished switch from Akka to Pekko 2023-09-01 15:52:12 +00:00
Paul Trudel
d1c8254f37 Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into akka-pekko-migration 2023-08-31 19:11:16 +00:00
Paul Trudel
90eef86bc1 Use Pekko in bbb-common-message, bbb-common-web, and akka-apps 2023-08-31 18:03:00 +00:00
Gustavo Trott
5eb04aab91 Resolve conflicts 2023-08-30 15:31:32 -03:00
Paul Trudel
225b2f2d74 Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into akka-pekko-migration 2023-08-29 12:06:56 +00:00
Gustavo Trott
5a82b4e119
Merge pull request #18540 from paultrudel/remove-add-slide-positions-msg
refactor: Remove unnecessary addSlidePositionsPubMsg
2023-08-18 15:11:14 -03:00
Paul Trudel
4c863cf2b4 Remove comments from testing 2023-08-18 14:57:23 +00:00
Paul Trudel
49a184d8c5 Remove unused parseDimension function 2023-08-18 14:55:35 +00:00
Paul Trudel
ee56979fa4 Use presentation svg to compute dimensions 2023-08-17 22:27:52 +00:00
Paul Trudel
f645dd2a12 Replaced Akka with Pekko in akka-fsesl 2023-08-17 14:20:50 +00:00
Gustavo Trott
d018fd6490 Resolve conflicts 2023-08-16 16:24:34 -03:00
GuiLeme
3761fc333b [plugin-architecture-implementation] - fix for disable downloadable 2023-08-16 11:18:51 -03:00
GuiLeme
14c59a90a7 [issue-18449] - changes in review 2023-08-15 11:22:50 -03:00
GuiLeme
c10df4c173 [issue-18449] - changes in review 2023-08-15 10:58:37 -03:00
GuiLeme
85f1bdae51 [issue-18449] - change in the flow, it is not necessary to click to disable one format to enable the other 2023-08-11 10:31:07 -03:00
GuiLeme
a1746da6fe [issue-18449] - added possibility of download original presentation with original format 2023-08-10 12:18:59 -03:00
Gustavo Trott
02ba4c6ff8 Fix: Getting final Url (from redirect) on presentation upload 2023-08-09 09:54:38 -03:00
Gustavo Trott
5681e88c60 Merge 2.7 into Develop 2023-06-26 17:21:01 -03:00
Anton Georgiev
43b96b47c4
Merge pull request #17724 from lfzawacki/v2.7.x-release
feat: Implement automatic closed captions using an open transcription server
2023-06-22 05:25:14 -04:00
Anton Georgiev
62248f0244
Merge pull request #18124 from gustavotrott/fix-ldashboard-emoji
fix (Learning Dashboard): Emoji not working on Learning Dashboard
2023-06-15 16:20:40 -04: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
2d737aa0ef Change target to release for java 17 2023-06-12 21:15:33 +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
Gustavo Trott
18e4bcceba Fix emoji not working on Learning Dashboard 2023-06-08 12:38:08 -03: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
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