BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,850 Commits 13 Branches 260 Tags 1.1 GiB
791a299bbe
Commit Graph

1297 Commits

Author SHA1 Message Date
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
Bohdan Zhemelinskyi
bae06f588e presentation allow null 2022-10-24 15:35:30 +00: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
Gustavo Trott
86000eb851
Update bigbluebutton-web/grails-app/conf/bigbluebutton.properties 2022-10-21 09:09:58 -03:00
Gustavo Trott
48fda8f3b2
Update bigbluebutton-web/grails-app/conf/bigbluebutton.properties 2022-10-21 09:09:42 -03:00
Paul Trudel
c5f234ddf4 Fixed issue with checksum algorithms 2022-10-21 06:50:23 +00:00
Gustavo Trott
245e67f418 Fix a problem where presentations is always null 2022-10-20 15:12:10 -03:00
Gustavo Trott
37fc589f71 Instruction to disable default presentation 2022-10-19 18:18:41 -03:00
Bohdan Zhemelinskyi
2ee70c671d set default as null 2022-10-19 20:17:53 +00:00
Bohdan Zhemelinskyi
927d97fc30 Merge branch 'defaultPresentationNull' of https://github.com/zhem0004/bigbluebutton into defaultPresentationNull 2022-10-19 19:39:09 +00:00
Daniel Petri Rocha
0a2b4186a2 Merge branch 'v2.6.x-release' into breakout-upload-ui 2022-10-19 19:51:05 +02:00
Bohdan Zhemelinskyi
e1c019eb65 unset null 2022-10-18 15:06:22 +00:00
Bohdan Zhemelinskyi
2e11b884f7 Merge branch 'v2.6.x-release' of https://github.com/bigbluebutton/bigbluebutton into defaultPresentationNull 2022-10-18 14:58:09 +00:00
Bohdan Zhemelinskyi
35ed3228ef set defaultPresentation-null 2022-10-18 14:57:54 +00: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
Gustavo Trott
9c185a52f4
Merge pull request #15782 from GuiLeme/remove-none-from-properties 2022-10-06 17:05:47 -03:00
GuiLeme
5ca4a92940 [issue-pdf-100-processing] - resolved conflicts 2022-10-06 09:58:42 -03:00
GuiLeme
c9b42a230e Merge branch 'issue-pdf-100-processing' of github.com:GuiLeme/bigbluebutton into issue-pdf-100-processing 2022-10-06 08:18:57 -03:00
Gustavo Trott
ec9bad1287
Merge pull request #15762 from zhem0004/removeSetPollsXML 2022-10-05 12:02:39 -03:00
GuiLeme
094c99029f [remove-none-from-properties] - commented line 2022-10-05 11:26:42 -03:00
Guilherme Pereira Leme
42da2a7a8c
[issue-pdf-100-processing] - Changes in review 
Co-authored-by: Gustavo Trott <gustavo@trott.com.br>
 2022-10-04 17:01:06 -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
Gustavo Trott
9a18f5fe61
Merge pull request #15467 from zhem0004/spring2726 2022-09-30 17:29:56 -03:00
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
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
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
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
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
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
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
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
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
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
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