BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,199 Commits 13 Branches 260 Tags 1.1 GiB
262cd0b735
Commit Graph

1954 Commits

Author SHA1 Message Date
Bohdan Zhemelinskyi
adcd139ec0 remove SetPollsXML 2022-09-30 14:24:09 +00:00
GuiLeme
362371834a Merge remote-tracking branch 'upstream/v2.6.x-release' into issue-pdf-100-processing 2022-09-30 10:34:23 -03:00
Bohdan Zhemelinskyi
dc9aebc91e Doc conversion service fix 2022-09-28 18:46:28 +00: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
Ramón Souza
2b0971e2c8 Merge tag 'v2.5.6' into merge-256-26 2022-09-26 09:17:59 -03:00
GuiLeme
633a032fd0 [issue-pdf-100-processing] - implemented retry flow and fixed error message 2022-09-22 16:58:37 -03:00
Bohdan Zhemelinskyi
06eb9dd246 treat property file as optional 2022-09-21 17:40:26 +00:00
Gustavo Trott
052fc41c41
Merge pull request #15610 from paultrudel/meeting-api-fixes-25 2022-09-21 09:26:24 -03:00
Daniel Petri Rocha
e23d00004f 'Capture Shared Notes' button in front-end 2022-09-20 17:43:13 +02:00
Bohdan Zhemelinskyi
0c735ed893 fix property comments 2022-09-19 20:46:24 +00:00
Bohdan Zhemelinskyi
aa3dd56228 update propertys source 2022-09-19 20:27:59 +00:00
Daniel Petri Rocha
c84c2e2892 Merge branch 'v2.6.x-release' into breakout-upload-ui 2022-09-19 19:30:18 +02:00
zhem0004
25411152a3
Update bigbluebutton-web/grails-app/conf/bigbluebutton.properties 
Co-authored-by: Gustavo Trott <gustavo@trott.com.br>
 2022-09-16 14:34:54 -04: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
Bohdan Zhemelinskyi
7f42e28ec7 place spring version in one place and cleanup 2022-09-08 18:40:19 +00:00
zhem0004
0a0d768627 Merge branch 'spring2726' of https://github.com/zhem0004/bigbluebutton into spring2726 2022-09-08 11:24:50 -04:00
Bohdan Zhemelinskyi
e3c0abe62a changes on comment 2022-09-08 14:59:56 +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
Bohdan Zhemelinskyi
52464ad179 fix on comment 2022-09-08 14:05:35 +00:00
Brent Baccala
00b635e763 bigbluebutton-web: when matching user-supplied meeting IDs in API 
calls, use ServiceUtils.findMeetingFromMeetingID instead of
meetingService.getMeeting, in order to handle either external or
internal meeting IDs
 2022-09-05 23:16:39 -04: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
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
GuiLeme
c0567c9c93 [issue15565] - remove allow property 2022-08-19 16:49:06 -03:00
GuiLeme
8ee93432b9 [issue15565] - Fixed current attribute not being respected 2022-08-19 15:59:26 -03:00
Paul Trudel
f84698cd5c changes to max pariticpants calculation and guest policy 2022-08-16 15:15:45 +00:00
Daniel Petri Rocha
3529fe9f28 Rename parameters; hide download button and label when disabled 2022-08-02 15:53:40 +02:00
Daniel Petri Rocha
5dfc9293fb Merge branch 'v2.6.x-release' into pdf-disabledFeatures-tldraw 2022-08-02 12:29:38 +02:00
Bohdan Zhemelinskyi
7582b8891a upgrade spring to 2.7.x 2022-07-30 14:50:03 +00:00
Bohdan Zhemelinskyi
fd31c78ec4 temp changes 2022-07-29 19:03:25 +00:00
Daniel Schreiber
e0e1d9e5b3 Fix: use grails configuration for CORS settings 
Grails can handle CORS on its own. It just has to be configured in
`/etc/bigbluebutton/bbb-web.properties`:

~~~
grails.cors.enabled=true
grails.cors.allowedOrigins=https://bbb-proxy.example.org
grails.cors.allowCredentials=true
~~~

This is a breaking change of the nginx config if (and only if) you run a
cluster setup as described in
https://docs.bigbluebutton.org/admin/clusterproxy.html

**If** you run such a setup, you **need** to change
`/etc/bigbluebutton/bbb-web.properties`. Otherwise users won't be able
to join meetings, upload slides etc.

The change in `PresentationController.groovy` fixes the handling of
`OPTIONS` requests in the `/bigbluebutton/presentation/checkPresentation`
handler.
 2022-07-27 23:30:36 +02:00
Bohdan Zhemelinskyi
e016e6985b error detecting 2022-07-21 18:30:48 +00:00
Anton Georgiev
7b8b45daa8 refactor: further cleanup of bbb-demo 2022-07-14 14:55:10 +00:00
Paul Trudel
bce9916cba Removed H2 from bbb-web 2022-07-12 17:59:23 +00:00
Daniel Petri Rocha
5f98290413 Add presentationWithAnnotationDownload, exportPresentationWithAnnotation to disabledFeatures 2022-07-12 18:58:56 +02:00
Bohdan Zhemelinskyi
5ed9fa2cca upgrade spring to 2.7.x 2022-07-07 19:23:58 +00:00
Gustavo Trott
807f0286c9
Merge pull request #14786 from paultrudel/recording-api-changes 2022-06-30 15:57:23 -03:00
Gustavo Trott
502523a048
Merge pull request #14562 from danielpetri1/container-approach 2022-06-30 11:33:47 -03:00
Paul Trudel
ff8a68e20b Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into recording-api-changes 2022-06-29 13:24:45 +00:00
prlanzarin
6225042148 feat: add user name to checkAuthorization response 
Audio's callerId depends on the user name and there isn't
an "on-demand" way of fetching that field internally, making callerId
assembly with trusted attributes (server-side generated) impossible in
bbb-webrtc-sfu.

The new extra header (User-Name, mapped to user_name in the proxied
connection) allows fetching the user name field in a cheap way and
consequently provides a cheap+safe way of assembling the callerId.

Alternatives I've considered but discarded:
  - a new akka-apps req-resp pair for fetching the user name (+overhead)
  - a new akka-apps req-resp pair for generating the callerId (+overhead)
  - piggybacking on GetMicrophonePermissionReq/Resp to generate the
    callerId (same overhead, but mixing responsabilities)
 2022-06-28 20:33:36 +00:00
Daniel Petri Rocha
c9b9ab65ef Merge branch 'export-annotations' into tldraw-with-annotation-export 2022-05-15 21:47:06 +02:00
Anton Georgiev
c4874398f6 chore: Merge 2.5.0-rc.2 into develop 2022-05-13 21:03:34 +00:00
Paul Trudel
65d5cacb5f Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into recording-api-changes 2022-05-12 14:30:35 +00:00
Gustavo Trott
40fc2473bf
Merge pull request #14944 from GuiLeme/issue-14828 2022-05-11 19:06:02 -03:00
GuiLeme
2afe4526a8 [issue-14828] - Logic change of processing current parameter. 2022-05-11 16:25:44 -03:00
GuiLeme
23aaeedef2 [issue-14828] - Changed order of inserting the default.pdf document 2022-05-11 10:40:56 -03:00
Ramon Souza
0d3a5326fc Merge remote-tracking branch 'upstream/v2.5.x-release' into 25260-may10 2022-05-10 10:53:00 -03:00
Ramón Souza
b6a197358e
Merge pull request #14983 from antobinary/custom-layout 
chore: Set defaultMeetingLayout to CUSTOM_LAYOUT
 2022-05-09 14:14:06 +01:00
Anton Georgiev
5ae853b342 chore: Set defaultMeetingLayout to CUSTOM_LAYOUT 2022-05-09 13:03:43 +00:00
Fred Dixon
cd0ee4e45c Remove old refernece to phone icon 2022-05-08 14:49:03 -05:00
Guilherme Leme
b95cba3ded [issue-14819] - When sending a batch with no current with default.pdf, that will be the current. 2022-05-05 17:45:36 -03:00
Guilherme Pereira Leme
01c46cbb63
Changes in review 
Co-authored-by: Gustavo Trott <gustavo@trott.com.br>
 2022-05-04 17:14:44 -03:00
Guilherme Leme
5fc66ccf12 [issue-14828] - preUploadedPresentationOverrideDefault can now be sent in url (it will override the config) 2022-05-04 14:13:00 -03:00
Guilherme Leme
df30e30a1e [issue-14828] - Implemented feature to upload presentations in create API and still have default.pdf 2022-05-04 11:06:48 -03:00
Daniel Petri Rocha
19bbb4115d Refactor handlers, role validation 2022-04-30 23:28:11 +02:00
Daniel Petri Rocha
7851d54484 PDF file: include meeting and room name 2022-04-29 13:50:42 +02:00
Paul Trudel
f5c2e1929c Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into recording-api-changes 2022-04-21 15:01:44 +00:00
Paul Trudel
333a01aab4 Changed RecordingService implementation back to file 2022-04-19 19:38:21 +00:00
Arthurk12
cff605e996 feat(webcam): pin multiple cameras simultaneously 
Adds support for multiple cameras pins.
The pinned cameras are stored in a FIFO-type queue
When a camera is pinned the oldest one is removed.
The queue size can be set via create parameter 'maxPinnedCameras',
if not defaults to 3.
 2022-04-18 20:17:58 +00:00
Anton Georgiev
aaef76cd2e Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into merge-25-dev 2022-04-13 20:58:02 +00:00
Anton Georgiev
c808f1f1dd chore: Drop .dockerignore and docker-entrypoint.sh files #14814 2022-04-13 17:17:08 +00:00
Anton Georgiev
13bed65baf chore: drop obsolete Dockerfile from BBB 2022-04-12 20:34:28 +00:00
Anton Georgiev
8a75e5cc7a fix: Adjust property path for grails session.cookie.secure 2022-04-12 20:28:07 +00:00
Paul Trudel
50662e3e65 Fixed issue with pagination response 2022-04-11 19:50:33 +00:00
Paul Trudel
1d434e65b7 Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into recording-api-changes 2022-04-11 13:36:11 +00:00
Anton Georgiev
1500fb6a29 Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into merge-25-dev 2022-04-09 00:55:25 +00:00
Anton Georgiev
33575e60e6 Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into v2.5.x-release 2022-04-09 00:48:14 +00:00
Ramon Souza
1c873bd8d6 Merge remote-tracking branch 'upstream/v2.4.x-release' into merge-2425-apr08 2022-04-08 17:30:21 -03:00
Paul Trudel
aa956919c2 Updated recording changes for 2.6 2022-04-08 18:46:54 +00:00
Daniel Petri Rocha
6703ac8ba1
Merge branch 'bigbluebutton:develop' into container-approach 2022-04-05 12:42:10 +02:00
Bohdan Zhemelinskyi
d9dc567da3 tomcat embedded version in one place 2022-04-04 20:25:57 +00:00
Ramon Souza
4c328bc4ea Merge remote-tracking branch 'upstream/develop' into issue-14382 2022-04-04 16:25:50 -03:00
Bohdan Zhemelinskyi
fbf33ba298 upgrade embedded tomcat 2022-04-04 18:44:42 +00:00
Gustavo Trott
6ae068ecfb Avoid to override the first backup 2022-03-31 14:53:25 -03:00
Gustavo Trott
4ab9b9bc17 Improve scripts to run/deploy applications 2022-03-31 13:48:57 -03:00
Anton Georgiev
4ad4e8e7fa
Merge pull request #14668 from GuiLeme/issue-14335 
[issue-14335]- Deprecate password on the endpoints.
 2022-03-30 11:47:55 -04:00
Paulo Lanzarin
08c59a60b4
fix: false positive when checking if bbb-web is running, run-dev.sh 
-a flag would list everything, including UNIX sockets, and then arbitrarily grep for 8090. That would lead to false positives.
Swap -an for -lt (only TCP sockets on LISTEN) so we can drop the extra LISTEN grep. 
Add an extra `:` to the port grep (avoid factoring things like tcp 18090)
 2022-03-30 10:31:05 -03:00
Guilherme Leme
247794ff45 [issue-14335] - Changes in review, the random password has been added if a null one is sent while creating the meeting to avoid crashes in old integrations. 2022-03-30 10:07:46 -03:00
Daniel Petri Rocha
9c10a46aee Merge branch 'develop' into container-approach 2022-03-29 13:12:33 +02:00
Ramon Souza
68f55b8c7b Merge remote-tracking branch 'upstream/develop' into issue-14382 2022-03-25 09:21:15 -03:00
Guilherme Leme
b4bf27c199 [issue-14335]- Refactored endpoints to not need the password anymore. It is in deprecated state now. 2022-03-24 15:35:17 -03:00
Anton Georgiev
6b4a7ff898 refactor: swap netstat with ss 2022-03-23 20:50:19 +00:00
Gustavo Trott
a6c3af7b0f Add disabledFeatures=virtualBackgrounds 2022-03-22 16:01:27 -03:00
Gustavo Trott
4cb563085f Implements param lockSettingsHideViewersCursor 2022-03-21 15:25:41 -03:00
Gustavo Trott
fb587f8c84
Merge branch 'v2.5.x-release' into disabledFeatures-layouts 2022-03-18 15:46:45 -03:00
Anton Georgiev
adfbaa4409
Merge pull request #14599 from gustavotrott/disabledFeatures-breakoutRooms 
feat: Support to disable breakout rooms via disabledFeatures
 2022-03-18 14:41:02 -04:00
Anton Georgiev
2cc29ebacb fix: bbb-web exclude micronaut-aop-3.0.3.jar 2022-03-17 09:10:45 +00:00
Anton Georgiev
dba9a153f9 build: handle bbb-web pres-checker 2022-03-16 20:14:53 +00:00
Ramon Souza
a89e9da4ea Merge remote-tracking branch 'upstream/develop' into issue-14382 2022-03-16 16:53:17 -03:00
Anton Georgiev
7501c2788a Merge branch 'java11-2' of github.com:zhem0004/bigbluebutton into java11-2 2022-03-16 18:04:06 +00:00
Gustavo Trott
6562cbc6e7
Merge branch 'v2.5.x-release' into disabledFeatures-breakoutRooms 2022-03-16 14:57:46 -03:00
Bohdan Zhemelinskyi
cb716b005b modified common-message for java 11 2022-03-16 17:45:11 +00:00
Anton Georgiev
74b209e17a
Merge pull request #14603 from danielpetri1/current-as-upload-parameter 
fix: Adds 'current' as optional parameter of the internal upload endpoint
 2022-03-16 13:44:04 -04:00
Anton Georgiev
d4e8f6ef4a
Merge pull request #14572 from gustavotrott/support-disabledFeatures 
fix: Keep support for deprecated API param learningDashboardEnabled
 2022-03-16 11:46:29 -04:00
Anton Georgiev
0d1d45245c
Merge pull request #14570 from gustavotrott/disabledFeatures-notes 
feat: Support to disable shared notes and captions via disabledFeatures
 2022-03-16 11:45:52 -04:00
Daniel Petri Rocha
3d74878f51 Adds 'current' as optional parameter in the upload endpoint 2022-03-15 18:21:19 +01:00
Gustavo Trott
c214a479f9 Implements disabledFeatures=layouts 2022-03-15 10:40:02 -03:00
Gustavo Trott
c6bfb4b7ec fix error 2022-03-14 15:35:00 -03:00
Gustavo Trott
5fdacf93dd Merge remote-tracking branch 'upstream/v2.5.x-release' into disabledFeatures-breakoutRooms 2022-03-14 15:33:04 -03:00
Gustavo Trott
adc1c8cef8 Implements disabledFeatures=breakoutRooms 2022-03-14 15:30:41 -03:00
Guilherme Leme
9104a0308e [issue-14321] - Changes to make it possible to send 2 presentations with the same name 2022-03-14 12:10:27 -03:00
Ramón Souza
d008981855 add notifyRecordingIsOn create param 2022-03-10 20:17:57 +00:00
Gustavo Trott
9f939513b0 Implements disabledFeatures=captions 2022-03-10 15:02:20 -03:00
Pedro Beschorner Marin
5cd2b0b635 Merge remote-tracking branch 'bigbluebutton/v2.5.x-release' into f-v-amccc 2022-03-10 12:25:17 -03:00
Gustavo Trott
bedaf4de98 Add support for deprecated API param learningDashboardEnabled 2022-03-09 18:04:34 -03:00
Gustavo Trott
537704ef0e Implements disabledFeatures=sharedNotes 2022-03-09 16:23:38 -03:00
Gustavo Trott
057b7514b1 Implements disabledFeatures-chat 2022-03-09 11:19:25 -03:00
Gustavo Trott
2719bd4f65 Implements disabledFeatures=externalVideos 2022-03-09 10:33:18 -03:00
Gustavo Trott
3013c2792b Implements disabledFeatures/polls 2022-03-08 15:05:24 -03:00
Pedro Beschorner Marin
6ff1d680d9 feat(video): add meeting camera cap control 
Include `meetingCameraCap` API param on create and enforce both server and
client to control the number of simultaneous webcams a meeting can have.

Disabled by default.
 2022-03-07 09:36:55 -03:00
Anton Georgiev
5c7662187b
Merge pull request #14497 from gustavotrott/disabledFeatures-learningDashboard 
refactor: Move learningDashboardEnabled to disabledFeatures
 2022-03-03 15:29:07 -05:00
Anton Georgiev
6890988381
Merge pull request #14527 from pedrobmarin/r-g-ipi 
refactor(guest): increase polling interval
 2022-03-03 15:26:21 -05:00
Pedro Beschorner Marin
3879f87f2b refactor(guest): increase polling interval 
Reduce the number of guest status' polls per minute.
 2022-03-03 16:07:58 -03:00
Gustavo Trott
f045aa7c31
Merge branch 'v2.5.x-release' into disabledFeatures-learningDashboard 2022-03-03 15:48:49 -03:00
Anton Georgiev
5f884f6674 Merge remote-tracking branch 'bbb/v2.4.x-release' into merge-24-into-25 2022-03-03 18:35:05 +00:00
Daniel Petri Rocha
1bc6b44e55 Notifier: send out link to file for download 2022-03-02 17:02:08 +01:00
Anton Georgiev
212578b7c8
Merge branch 'v2.5.x-release' into disabledFeatures-learningDashboard 2022-03-02 08:46:31 -05:00
Anton Georgiev
4b6b1998ff
Merge pull request #14500 from gustavotrott/disabledFeatures-warning 
fix: warning "disabledFeatures have no value"
 2022-03-02 08:37:33 -05:00
Anton Georgiev
9f6c6b7a0b
Merge pull request #14441 from pedrobmarin/r-s-fpr 
refactor(screenshare): FreeSWITCH partial removal
 2022-03-02 08:36:14 -05:00
Gustavo Trott
626fe0d52f Comment disabledFeatures by default 2022-03-02 10:31:55 -03:00
Gustavo Trott
9d6eaead02 Move api param learningDashboardEnabled to disabledFeatures 2022-03-01 17:27:54 -03:00
Anton Georgiev
cfb7c354ce
Merge pull request #14494 from GuiLeme/issue-14431 
Change in current attribute for InsertDocument endpoint
 2022-03-01 12:59:03 -05:00
Guilherme Leme
b8bba75b62 [issue-14431] - Implemented the back-end not to accept the current attribute comming from insert endpoint. 2022-03-01 14:27:09 -03:00
Anton Georgiev
4e268dffa3 WIP target JVM8 -> JVM11 2022-02-25 04:39:48 +00:00
Anton Georgiev
9c3be36552 Merge branch 'origin/jdk-17-upgrade' of github.com:himanshugoyal1065/bigbluebutton into test-java-11 2022-02-24 16:53:47 +00:00
Ramón Souza
138f4d64e4 Merge remote-tracking branch 'upstream/v2.4.x-release' into v2.5.x-release 2022-02-24 14:49:56 +00:00
Pedro Beschorner Marin
6d80a413cf refactor(screenshare): FreeSWITCH partial removal 
Remove part of the old FreeSWITCH dependent WebRTC screenshare feature.
 2022-02-23 13:03:51 -03:00
Pedro Beschorner Marin
e8ff5ebdc8 feat(video): add user camera cap control 
Include `userCameraCap` API param on create and enforce both server and
client to control the number of simultaneous webcams an user can share.

Default set to 3.
 2022-02-22 13:13:48 -03:00
Anton Georgiev
2d3c12def3
Merge pull request #14264 from GuiLeme/issue-14014 
Created endpoint to insert file into presentation.
 2022-02-16 15:10:12 -05:00
Anton Georgiev
070eafe880
Merge pull request #14334 from Tainan404/fix-left-guest-user 
Add a message for when the guest isn't valid
 2022-02-16 14:55:00 -05:00
Tainan Felipe
d609a1fd8d Fix lint errors 2022-02-16 15:55:11 -03:00
Paul Trudel
09936c5b4d Changed format of number values in getMeetingInfo to remove commas 2022-02-11 18:51:27 +00:00
Anton Georgiev
88d03241e4
Merge pull request #14348 from paultrudel/format-api-num-values 
fix: Change format of number values in getMeetingInfo
 2022-02-11 13:31:09 -05:00
Paul Trudel
4ccf48fb5a Changed format of number values in getMeetingInfo to remove commas 2022-02-11 17:40:40 +00:00
Tainan Felipe
b730ef7aa2 Add a message for when the guest isn't valid 2022-02-10 16:31:35 -03:00
Guilherme Leme
f9d97ca562 [issue-14014] / [issue-14313] / [issue-14312] - Fixed and refactored back-end to fit the logic of passing parameters, not only by document with url, but by base64 encoded document too. And refactored front-end. 2022-02-10 15:27:44 -03:00
Pedro Beschorner Marin
982cd934b4 feat(guest): configurable wait timeout 
Replace the hardcoded guest's waiting timeout between polling requests - reference used
to remove a guest from the waiting list when the user leaves the waiting page - with a
bbb-web's configuration property.
 2022-02-10 08:24:57 -03:00
Guilherme Leme
c10dd9121e [issue-14014] - Made some changes in back-end logic to put the first presentation as current, if none is marked as current. 2022-02-09 10:40:42 -03:00
Guilherme Leme
25f506df6c [issue-14014] Reverted changes in configuration. 2022-02-09 10:20:30 -03:00
Gustavo Trott
580ebdc066 Move disabledFeatures to meetingProp, and rename feat screensharing to screenshare 2022-02-07 15:55:45 -03:00
Himanshu Goyal
cf3b534604
Merge branch 'bigbluebutton:develop' into origin/jdk-17-upgrade 2022-02-07 19:12:25 +05:30
Gustavo Trott
dad9be2a6a Merge remote-tracking branch 'upstream/v2.5.x-release' into api-param-disabledFeatures 2022-02-07 10:23:28 -03:00
Gustavo Trott
de4688bcdc Implement new param disabledFeatures 2022-02-07 10:22:52 -03:00
Guilherme Leme
ea09c7001c [issue-14014] - WIP adding current tag on presentation payload 2022-02-04 14:52:53 -03:00
Guilherme Leme
7650967b2f Resolved merging conflicts. 2022-02-04 08:48:58 -03:00
Guilherme Leme
75f3eab3f8 Resolve merging conflicts 2022-02-03 12:03:26 -03:00
Guilherme Leme
655c81c8f4 [Issue-14014]-Implemented the logic in the controller and refactored the function uploadDocuments to fit the new scenario. I also created the insert model to be validated. 2022-02-03 09:33:29 -03:00
Anton Georgiev
c34b79f39c
Merge pull request #14260 from zhem0004/jQueryUpdate 
refactor(bbb-web): Cleanup of bigbluebutton-web Grails assets
 2022-02-02 15:26:28 -05:00
Bohdan Zhemelinskyi
69c767750e cleanup 2022-02-02 19:44:02 +00:00
Anton Georgiev
8404048cfd
Merge pull request #14134 from hiroshisuga/fixpreupload 
fix(bbb-web) broken Asian filename for pre-uploaded presentation (fix on bbb-web)
 2022-01-31 10:43:37 -05:00
hiroshisuga
2c3b180ee0
add error-catch 2022-01-26 07:46:20 +09:00
Ramón Souza
16cd3c4ebb Merge remote-tracking branch 'upstream/v2.4.x-release' into dev-24-0125 2022-01-25 16:56:52 +00:00
Anton Georgiev
5f4c5cdedb
Merge branch 'develop' into r-r-e-acea 2022-01-24 16:05:57 -05:00
Anton Georgiev
a761f0177a
Merge pull request #14143 from frankemax/fix-userdata-injection 
fix(userdata): consistent breakout room userdata
 2022-01-24 15:10:38 -05:00
Pedro Beschorner Marin
c9043655f1
Merge branch 'develop' into position-in-waiting-queue 2022-01-24 14:31:03 -03:00
Pedro Beschorner Marin
810deb907b refactor(etherpad): access control et al. 
Move all Etherpad's access control from Meteor to a separated [Node application](https://github.com/bigbluebutton/bbb-pads).
This new app uses [Etherpad's API](https://etherpad.org/doc/v1.8.4/#index_overview)
to create groups and manage session tokens for users to access them. Each group
represents one distinct pad at the html5 client.

- Removed locked users' access to pads: replaced readOnly pad's access with a new pad's content sharing routine
- Pad's access is now controlled by [Etherpad's API](https://etherpad.org/doc/v1.8.4/#index_overview)
- Closed captions edited content now reflects at it's live feedback
- Improved closed caption's dictation mode live feedback
- Moved all Etherpad's API control from Meteor to a separated [app](https://github.com/bigbluebutton/bbb-pads)
- Included access control both in akka-apps and bbb-pads
 2022-01-21 16:56:01 -03:00
Guilherme Leme
740de857cf [Issue-13238]-Implemented the logic related to receiving and sending the new removable attribute onwards. 2022-01-21 11:52:10 -03:00
Pedro Beschorner Marin
4a0882f9f2 fix(userdata): merge breakout room userdata 
Avoid using MongoDB to copy breakout room user's userdata. All userdata is
now merged at bbb-web's join API call.
 2022-01-19 10:58:13 -03:00
hiroshisuga
e9fee8f330
for preuploaded asian filename 2022-01-19 09:53:21 +09:00
Pedro Beschorner Marin
2bc370ce0b feat(api): allowRequestsWithoutSession as a meeting create param 
Add a create meeting parameter to enable or disable the user's cookie
session requests.
 2022-01-17 09:51:01 -03:00
Aleksandar Vasilev
6935b8293c
Merge branch 'bigbluebutton:develop' into position-in-waiting-queue 2022-01-16 02:59:40 +01:00
Aleksandar Vasilev
6103ae960d
Merge branch 'bigbluebutton:develop' into develop-private-guest-lobby-messages 2022-01-16 02:58:43 +01:00
SashoVihVas
1862f60e05 Add private guest lobby messages 2022-01-12 14:10:30 +00:00
SashoVihVas
2d7c82e73d Add position in waiting queue for guest users 2022-01-12 03:08:43 +00:00
Paulo Lanzarin
158cda9a99
fix(webcams): missing allowModsToEjectCameras in resources.xml 
Setting wasn't being picked up on bbb-web/bigbluebutton.properties.
Only worked as a `create` parameter
 2021-12-22 13:46:51 -03:00
root
427cd8ac34 Merge branch 'develop' into origin/jdk-17-upgrade 2021-12-17 15:59:00 +00:00
root
de232a3f34 upgrading bigbluebutton-web 2021-12-17 12:39:03 +00:00
prlanzarin
31df1b0efe chore: add legacy checkAuthorization endpoint 
For the sake of backwards compatibility
 2021-12-16 23:43:55 -03:00
Richard Alam
223b5488c7
Merge pull request #13932 from paultrudel/make-create-passwords-optional 
Added logging for passwords
 2021-12-15 14:30:31 -05:00
paultrudel
65688af8b0 Added logging for passwords 2021-12-15 14:28:37 -05:00
prlanzarin
21c124b854 feat(webcams): server-side logic to allow moderators to close user's webcams 
Includes a new create param/web conf called allowModsToEjectCameras, false by
default.

Ejection does not work in breakout rooms or with non-mod users

Ejection closes _all_ webcams shared by the target user
 2021-12-13 19:49:41 +00:00
Anton Georgiev
aa03a8093b
Merge pull request #13827 from prlanzarin/u24-desolation-seed 
chore: add user infos in custom HTTP headers to checkAuthorization's OK, forward them to SFU
 2021-12-06 12:34:40 -05:00
prlanzarin
434b2200b1 chore: add user infos in custom headers to checkAuthorization OK response 2021-12-03 19:48:30 +00:00
Anton Georgiev
578332a094
Merge pull request #13731 from schrd/cluster_proxy 
Allow BBB to run behind a proxy the avoid gUM permission queries per node
 2021-12-03 11:32:07 -05:00
Anton Georgiev
a2d8b59e4d
Merge pull request #13814 from prlanzarin/u24-sahel-terroir 
fix(core): look for session/jsession cookie in checkAuthorization endpoint
 2021-12-02 16:01:52 -05:00
prlanzarin
5dfc2f10cb fix(core): look for session/jsession cookie in checkAuthorization endpoint 2021-12-02 15:53:39 +00:00
Gustavo Trott
df60295d22 Implements join param excludeFromDashboard 2021-11-26 14:07:03 -03:00
Daniel Schreiber
c97c033cfd Update packaging and nginx config for loadbalancer 
To ease setup some changes required in the nginx config for load
balancer setup are prepared here. They do not harm non-loadbalancer setups.

The changes in the system startup scripts are mandatory
 2021-11-21 21:12:50 +01:00
Joao Siebel
1f6d44763f Add version tag back to api response 2021-11-03 11:11:33 -03:00
Anton Georgiev
123705bd37
Merge pull request #13609 from jfsiebel/bbb-version-api-response 
Add bbb version in api response
 2021-11-02 16:35:38 -04:00
Anton Georgiev
ca5815ebbc
Merge pull request #13589 from jfsiebel/add-role-join-param 
Add role parameter in join url
 2021-11-02 16:35:11 -04:00
Anton Georgiev
4731d767c7
Merge pull request #13616 from paultrudel/remove-additional-logging 
Removed additional session info logging from api controller
 2021-11-01 13:47:19 -04:00
paultrudel
a7edb2536c Removed additional session info logging from api controller 2021-11-01 13:04:18 -04:00
Joao Siebel
cb4c21a7ac Add bbb version in api response 2021-10-29 17:20:19 -03:00
paultrudel
fc39ddf93b duplicate voice bridge now returns the proper error 2021-10-29 14:39:10 -04:00
paultrudel
33956cf6b2 Reverted sessionToken value in enter reject response 2021-10-27 17:07:05 -04:00
paultrudel
1fe0f93ab2 Added an import that was accidentally removed 2021-10-27 15:00:43 -04:00
paultrudel
aa5b105e6e Added more logging to ApiController 2021-10-27 14:58:05 -04:00
paultrudel
cd92f4a4f4 modified sessionToken value name in enter response 2021-10-27 14:31:29 -04:00
Joao Siebel
7ea48706ef Add role parameter on join 2021-10-27 15:28:11 -03:00
paultrudel
960ed35810 added more logging to API controller 2021-10-27 13:31:32 -04:00
paultrudel
5fe8577098 Added additional logging to bbb-web api controller 2021-10-27 12:43:21 -04:00
Gustavo Trott
ae88e8d325 Add Api/learningDashboard properly validation 2021-10-18 18:15:46 -03:00
Gustavo Trott
efee460fe4 Update Api/LearningDashboard validation in favor of #13371 2021-10-18 17:08:47 -03:00
Anton Georgiev
a1e3bbebd3
Merge pull request #13488 from gustavotrott/learning-dashboard-individual-token 
refactor: Makes LearningDashboard data be provided by bbb-web (avoid demoted user to receive updates)
 2021-10-18 13:37:03 -04:00
Gustavo Trott
0102104fbe Makes bbb-web provide LearningDashboard data while meeting is alive 2021-10-14 14:00:25 -03:00
paultrudel
6f40fa115d Merge branch 'v2.4.x-release' of https://github.com/bigbluebutton/bigbluebutton into change-message-key-value 2021-10-06 16:02:48 -04:00
Anton Georgiev
59fc722529 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-23-24 2021-10-05 17:14:46 +00:00
paultrudel
5e3f33131c Reverted the messageKey values in validation error messages back to their old values 2021-10-01 15:31:30 -04:00
Gustavo Trott
5a8e44d7d6 Includes to pres-checker a checksum of a image that makes Libreoffice crash 2021-09-30 15:41:15 -03:00
Gustavo Trott
382c43e0bc Includes to pres-checker a checksum of a image that makes Libreoffice crash 2021-09-30 14:09:48 -03:00
Pedro Beschorner Marin
c43ca7a22d fix(guests): max participants 
Waiting users shouldn't count as valid participants at the meeting's
`maxParticipants` constraint.

Avoid calling `enter` at the waiting page.

Reference https://github.com/bigbluebutton/bigbluebutton/pull/10542
 2021-09-28 08:31:18 -03:00
Anton Georgiev
948d8695b7
Fix link to BBB tutorials on 2.3 
Closes #13136
Same as #13137 but on 2.3 branch
 2021-09-02 11:30:46 -04:00
Anton Georgiev
0fc1c40125
Fix link to BBB tutorials 
Closes #13136
 2021-09-02 11:26:30 -04:00
Anton Georgiev
a8bebbe91c
Merge pull request #13133 from gustavotrott/learning-dashboard-adjustments 
Makes configurable the delay to clean up Learning Dashboard
 2021-09-02 10:45:15 -04:00
Gustavo Trott
d2c405ddf2 Renames config learningDashboardCleanupInMinutes to learningDashboardCleanupDelayInMinutes 2021-09-01 16:52:52 -03:00
paultrudel
39aaa52b25 Move max participant check back to Api 
Controller
 2021-09-01 15:50:45 -04:00
Gustavo Trott
76c6a9d107 Replaces config learningDashboardCleanupEnabled by learningDashboardCleanupInMinutes 2021-09-01 15:51:22 -03:00
Gustavo Trott
da5be38196 Merge branch 'learning-dashboard-improvements2' of github.com:gustavotrott/bigbluebutton into learning-dashboard-improvements2 2021-08-30 16:25:31 -03:00
Gustavo Trott
029b4195ad Better description for the new config learningDashboardCleanupEnabled 2021-08-30 16:24:58 -03:00
Gustavo Trott
6970a0ab30
Merge branch 'develop' into learning-dashboard-improvements2 2021-08-30 15:23:04 -03:00
Anton Georgiev
4ecb24b4fa Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-aug30 2021-08-30 18:11:16 +00:00
Gustavo Trott
9b88431152 Set LearningDashboard enabled by default 2021-08-26 15:41:42 -03:00
Gustavo Trott
4c4323ec69 Implements Clean up of LearningDashboard files when meeting ends 2021-08-26 14:18:09 -03:00
Gustavo Trott
cd15f17394 Refactor all references for activity-report renaming to learning-dashboard 2021-08-25 11:38:35 -03:00
Pedro Beschorner Marin
1db49719c9 feat(web): set default logo 
Add an option to set a default logo to be placed for all created meetings.

The default logo is inserted as a create meeting param for all meetings that
do not have a `logo` param defined. Two new properties were included at
bigbluebutton-web configuration:

- [Boolean] `useDefaultLogo`: enables/disables the use of the default logo
  disabled as default

- [String] `defaultLogoURL`: The default logo URL to be fetched by the client
  bigbluebutton logo as default
 2021-08-19 15:22:44 -03:00
Joao Siebel
13913a6111 Remove LEGACY option for valid layouts. close #12858 2021-08-10 09:50:13 -03:00
Gustavo Trott
b3e1e188bf Includes in config file a brief description of the activity report 2021-08-06 20:00:24 -03:00
paultrudel
2af81a3a9e fixed issue with guests not joining meeting after being approved 2021-07-30 15:57:30 -04:00
Gustavo Trott
184f89c152 Merge branch 'activity-report' of github.com:gustavotrott/bigbluebutton into activity-report 2021-07-23 14:06:34 -03:00
Gustavo Trott
99272fe546 Set activityReportTracking=true by default 2021-07-23 13:58:40 -03:00
Gustavo Trott
e4ef1582f2
Merge branch 'develop' into activity-report 2021-07-22 11:33:47 -03:00
Gustavo Trott
3c6155a73e Creates config activityReportTracking to enable Activity Report 2021-07-22 11:09:44 -03:00
Anton Georgiev
1abedcc698
Merge pull request #12789 from jfsiebel/implement-default-layout-config 
Allow default layout config in bbb-web
 2021-07-21 16:11:08 -04:00
Gustavo Trott
b0f9835ffd Merge branch 'develop' into activity-report 2021-07-21 14:20:27 -03:00
Anton Georgiev
472c9a6107 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into 237-into-develop 2021-07-20 15:21:21 +00:00
paultrudel
0d526845cb removed 'Validation Error' from client error message 2021-07-19 15:07:07 -04:00
Joao Siebel
8462465a5f Allow default layout config in bbb-web. close #12668 2021-07-19 11:02:58 -03:00
Fred Dixon
2ed305bd2c Fix URLS for bigbluebutton.org 2021-07-18 14:24:51 -05:00
paultrudel
fe9d356230 changed validation error message 2021-07-14 14:16:32 -04:00
Gustavo Trott
45d4c310c2 Merge branch 'develop' into activity-report 2021-07-13 11:12:45 -03:00
paultrudel
e5f13e7916 added postman test scripts to test to the functionality of the bbb-web api 2021-07-12 11:24:09 -04:00
paultrudel
078a369b68 Minor bug fixes to validation in some validators 2021-06-30 13:21:28 -04:00
paultrudel
f74ea387d7 updates to validation on all api endpoints 2021-06-30 10:17:08 -04:00
Gustavo Trott
7d76ccac4c Change default Activity-report directory 2021-06-24 16:37:15 -03:00
Gustavo Trott
de9896d8c5 Akka sends pubSub ActivityReportEvtMsg and Bbb-web listen and export the content as Json file 2021-06-24 16:22:27 -03:00
paultrudel
1191713b48 fixed merge conflicts 2021-06-24 10:03:02 -04:00
paultrudel
a2cd27c1f9 merge with update-api-create-join-validation 2021-06-24 09:32:23 -04:00
paultrudel
1cdfbbd08a updated validation for bbb-web api create/join 2021-06-23 11:17:35 -04:00
Anton Georgiev
5ee5ed1970 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-june16 2021-06-16 19:54:28 +00:00
Anton Georgiev
3e5214234b
Merge pull request #12469 from jfsiebel/allow-tags-meeting-user-name 
Allow tags in meeting and user name
 2021-06-15 10:28:58 -04:00
Richard Alam
eb09e75fe5 Add new maven repos 
Running build.sh was failing because it cannot resolve some dependencies off of https://repo.grails.org/grails/core repo.
 Added other repos to use as location of dependencies.
 2021-06-08 15:52:37 +00:00
Anton Georgiev
e01bdf69c5 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into june2-merge-into-develop 2021-06-02 18:45:31 +00:00
Anton Georgiev
8868e84e9f
Merge pull request #12395 from gustavotrott/end-when-no-moderator 
Implements endWhenNoModerator
 2021-05-31 10:59:55 -04:00
Joao Siebel
f16700a8c4 Allow tags in meeting and user name. close #10221 close #12370 2021-05-31 09:59:15 -03:00
Anton Georgiev
5c94eb846d refactor: Isolate recording apis into RecordingController 2021-05-27 16:02:17 +00:00