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
prlanzarin
434b2200b1
chore: add user infos in custom headers to checkAuthorization OK response
2021-12-03 19:48:30 +00: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
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
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
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
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
Anton Georgiev
ced0cc0b26
removed configXML from bbb-web
2021-05-22 16:13:29 +00:00
Gustavo Trott
5e0ccf47b2
Removes support of configToken param
2021-05-20 16:31:38 -03:00
Gustavo Trott
00240c925e
Implements endWhenNoModerator
2021-05-17 17:52:59 -03:00
Gustavo Trott
300179aaaf
Includes suggested change
...
Co-authored-by: Anton Georgiev <antobinary@users.noreply.github.com>
2021-04-27 22:02:55 -03:00
Gustavo Trott
f832ad7ca3
Includes warning that forceRasterizeSlides can be removed next release
2021-04-27 14:39:57 -03:00
Gustavo Trott
b6e0a571d5
Implements forceRasterizeSlides (force convert presentation to png before svg) and pngWidthRasterizedSlides (force png width (px))
2021-04-22 21:57:55 -03:00
Gustavo Trott
a08a0d33e1
Makes presentation svg resolution configurable, and set default to 300
2021-04-19 16:01:48 -03:00
Gustavo Trott
14301b27ea
Makes bbb-web return code 403 when uploaded file exceeds limit
2021-04-13 16:54:17 -03:00
Gustavo Trott
28555ed33d
Sends error code 413 to Upload request when file is too large
2021-04-09 15:41:19 -03:00
Gustavo Trott
3d1575e635
Send pubSub FileTooLarge Error Msg from bbb-web when file is too large, (and makes Akka send meetingId with presentation token msg)
2021-04-08 14:18:15 -03:00
Gustavo Trott
4b4588c20d
Handle and log timeout errors during conversions
2021-03-31 12:10:02 -03:00
Gustavo Trott
1c6f8a1610
Moves default pdfToSvg conversion timeout to config
2021-03-30 18:29:34 -03:00
Anton Georgiev
db57a56060
Merge pull request #11804 from PhMemmel/turn-server-overlay-config
...
Config overlay for bbb-web turn server config
2021-03-30 12:29:59 -04:00
Anton Georgiev
75e935d771
Merge pull request #11809 from gustavotrott/develop
...
Enhancements to presentation OfficeToPDF conversion
2021-03-30 12:27:25 -04:00
Gustavo Trott
58a05acce6
Implements max concurrent office2pdf conversions and set conversion timeout from config
2021-03-30 11:26:03 -03:00
Philipp Memmel
c3ff88cd78
config overlay for bbb-web turn server config
2021-03-30 11:57:37 +02:00
Pedro Beschorner Marin
beb694c74a
Improve guest lobby feedback
...
Included a message and a redirect for the cases where the guest is
not allowed to join or the meeting has expired/ended.
2021-03-29 22:17:59 -03:00
Gustavo Trott
e5a235efa5
Removes jodconverter configs that is not used anymore
2021-03-25 14:34:52 -03:00
Gustavo Trott
a69baba177
Removes jodconverter from project dependencies
2021-03-24 15:00:05 -03:00
Gustavo Trott
e9d5eca664
Replaces the presentation Office to Pdf converter using shellScript instead of jodconverter
2021-03-22 15:32:22 -03:00
Anton Georgiev
6c7da44940
replaced keepEvents with defaultKeepEvents and meetingKeepEvents
2021-03-18 02:31:47 +00:00
Pedro Beschorner Marin
0365018e92
Add guest lobby messages
...
Moderators are able to send a message to the meeting's guest lobby. This new
event reaches bbb-web and is sent to the guest user with her/his status response
while polling. All guest users that are waiting for acceptance will be able to
read this message.
enableGuestLobbyMessage is disabled by default.
2021-03-09 11:02:25 -03:00
Anton Georgiev
f814d5f8cd
Merge pull request #11470 from schrd/grails-config
...
add overlay config for bbb-web
2021-03-05 16:53:57 -05:00
Anton Georgiev
228bad03d5
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into march4-merge
2021-03-04 21:25:47 +00:00
Anton Georgiev
eba2d0ab58
Merge pull request #11535 from pedrobmarin/etherpad-patch
...
Rework padIds and turn bbb-web pad aware
2021-03-02 14:48:34 -05:00
Daniel Schreiber
e6f83df3f6
add overlay config for bbb-web
...
operators can define their own config for bbb-web which will not be
overwritten by packages.
bbb-conf is changed accordingly to write configuration values to
``/etc/bigbluebutton/bbb-web.properties`
2021-02-25 14:08:05 +01:00
Anton Georgiev
55e8de4357
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into feb18-merge
2021-02-18 20:33:19 +00:00
Anton Georgiev
f43560d535
Support for backend vs frontend nodejs instances bbb-html5
2021-02-16 03:19:31 +00:00
Pedro Beschorner Marin
09b39a8d63
Add extra pad validation
...
Associate pads with meetings so session validation is restricted to the
meeting's valid session tokens.
Meteor will dispatch new redis events on shared notes and closed captions
pads creation. This event will go through apps and reach web to populate
a new meeting's pad collection that contains all valid pad id's for that
session. Nginx will use this collection to check if the user's session token
belongs to the pad's authorized users.
Besides these modifications, an extra change will be needed at notes.nginx.
Location /pad/p/ needs to change it's auth_request:
from /bigbluebutton/connection/checkAuthorization;
to /bigbluebutton/connection/validatePad;
2021-02-10 13:37:04 -03:00
Ghazi Triki
5f683809cd
Make sure checksum validation is done first in join API and display an error without redirection in failure case.
2021-02-09 19:03:54 +01:00
Anton Georgiev
363c801338
Merge pull request #11215 from pedrobmarin/guest-draft
...
Disable authenticated guests
2021-02-05 16:13:46 -05:00
Jacob Burroughs
f4ecf4c7ed
Restore allowRequestsWithoutSession to resources.xml
...
Otherwise that property is not read from the bigbluebutton.properties file.
It was removed in an overzealous deletion in
418fdb1a31
2021-02-01 09:43:50 -06:00
Pedro Beschorner Marin
e595d31f80
Set default guest configuration
...
Changes to the current (v2.2) default configuration of the guest feature.
The ideal is to keep the simplified guest feature as default (`authenticatedGuests=false`)
but we also need to be in sync with Greenlight settings to make this happen.
Greenlight will have to re-add the `guest=true` param on user's join API call when ASK_MODERATOR
is set as guest's policy.
2021-01-23 21:58:34 -03:00
Pedro Beschorner Marin
0bbef12ac7
Authenticated guests feature controlled at bbb-web properties
2021-01-23 21:48:02 -03:00
Anton Georgiev
3135c6bb22
Handle guestWait url for multiple nodejs instanceIds
2021-01-05 15:38:21 +00:00
Anton Georgiev
55fe528e35
Change bigbluebutton.properties client url param
2020-12-16 15:49:20 +00:00
Anton Georgiev
8b65f9e15b
Set bbb-html5 loadbalancing to be round robin
2020-12-15 01:55:57 +00:00
Anton Georgiev
0be8773e4c
Loadbalance bbb-html5 in bbb-web based on CPU
2020-12-11 21:36:06 +00:00
Anton Georgiev
418fdb1a31
remove obsolete attendeesJoinViaHTML5Client moderatorsJoinViaHTML5Client
2020-12-09 19:11:50 +00:00
basisbit
34ad640ea7
Fix voice bridge compare
...
Cherry-picked https://github.com/bigbluebutton/bigbluebutton/pull/9855
Co-Authored-By: Pedro Beschorner Marin <pedrobmarin@gmail.com>
2020-12-09 14:55:47 +01:00
basisbit
7ba6bd9f7a
Fix voiceBridge collision
...
Cherry-picked the commits from https://github.com/bigbluebutton/bigbluebutton/pull/9251
The added code checks if a meetingID is unique and makes sure no two meetings use the same VoiceBridge. Also see Issue # 9024
2020-12-09 13:58:26 +01:00
Anton Georgiev
3faabd1821
Merge 2.2.29 and 2.2.30 into 2.3.x
2020-11-24 15:13:09 +00:00
Anton Georgiev
23f2df11d5
code changes to allow for meetings' redis events to be processed on different html5 nodejs pids
2020-11-18 20:34:02 +00:00
Anton Georgiev
ecbf575dcf
Merge pull request #10819 from bigbluebutton/join-api-sanitize
...
Sanitize parameters of API's. Fixes #10818
2020-11-13 10:55:38 -05:00
Tiago Daniel Jacobs
e59bcd0c33
Sanitize all received parameters
2020-11-13 06:54:32 +00:00
Tiago Daniel Jacobs
52e3eea552
Split error message from session token ( making it easier to translate - and more secure/ )
2020-11-13 06:13:48 +00:00
Tiago Daniel Jacobs
5c911ddeec
Sanitize fullName parameter of join API. Fixes #10818
2020-11-13 05:59:31 +00:00
Your Name
b4ecf53c80
Remove unwanted debug logging: This pushed the whole binary of every PDF uploaded into the logs.
2020-11-08 16:56:26 +01:00
Fred Dixon
d0bc77c3db
Updating stun: for bbb-web to use Google's stun server
2020-10-23 11:26:41 -03:00
Fred Dixon
f0867bed76
Fix typo
2020-10-21 22:10:44 -05:00
Fred Dixon
3da71359f1
Updating stun: for bbb-web to use Google's stun server
2020-10-21 22:08:59 -05:00
Anton Georgiev
0c7ead1916
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into oct16-merge
2020-10-21 14:48:02 +00:00
Pedro Beschorner Marin
2fb26ff0cf
Patch of improvements for bbb-web
...
This patch includes two improvements made for bbb-web. It tries to better isolate
the sessionToken's handling and session's validation, including logs for each one of
these steps; and removes maxParticipats control from registered users (that are no
longer removed from bbb-web collections) binding it to joined users or users that
reached the enter API call. The following adds more details about this last one:
User's regular flow to join a meeting goes around an API join call -> redis register event ->
redirect to client page -> API enter call -> redis join event. When the guest policy is ASK_MODERATOR,
non-moderators are registered and redirected to a guest lobby that polls for her/his guest status and
only enters the meeting after a moderator approval.
Using registered users as control to check how many participants are in a meeting is problematic because
non-approved guests are counted as participants and bbb-web has to find out when to ditch registered users
records to make a seat in a meeting available again. In other words, a meeting with maxParicipants
of 5 can get it's joins locked with a moderator and 4 waiting guests or bbb-web can wrongly drop a registered
user record on a reconnection inducing weird 401 responses from the API.
This change proposes to control maxParticipants both at join and enter API calls monitoring the number
of redis joined users. This also includes an extra buffer to capture users that called the enter API but
still don't have an user joined event.
User left events are now handled different holding the user data before removing from the joined users collection
and only releasing after verifying that the user didn't reconnected.
Both user left timeout `usersTimeout` and entered user timeout `enteredUsersTimeout` can be configured at properties.
2020-09-28 09:59:52 -03:00
Pedro Beschorner Marin
a98c4b68b5
Add secure tag to bbb-web JSESSIONID cookie
...
Revert this to make whatever you want when running bbb-web without https
2020-09-22 16:11:53 -03:00
Anton Georgiev
124b2d9b51
Merge branch 'develop' into move-guest-wait
2020-09-21 16:28:59 -04:00
Anton Georgiev
918f58b343
Moved the default avatar.png to be part of bigbluebutton-html5/
2020-09-21 12:24:12 +00:00
Anton Georgiev
d5450af5df
Merge pull request #10458 from pedrobmarin/avatar-image
...
Support for avatar images
2020-09-21 08:22:04 -04:00
Anton Georgiev
377dc27a8d
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 09-16-merge
2020-09-17 14:37:28 +00:00
Pedro Beschorner Marin
e2adf24546
Support for avatar images
...
Use the former Flash client avatarURL join param to replace the name
initials avatar from the user list, chat, waiting guests and connection
status list.
It is possible to define a defaultAvatarURL at bbb-web and enable/disable it
2020-09-15 16:50:10 -03:00
Richard Alam
9e6a40280e
- set html5 as default client
...
- add meetingEndedURL and endWhenNoModerator create param
- meetingEndedURL is complete
- endWhenNoModerator is partially implemented. Will be continued in another PR.
2020-09-05 08:43:12 -07:00
Anton Georgiev
14f464087f
Merge pull request #8417 from pedrobmarin/backend-cleanup
...
Backend cleanup
2020-08-28 15:37:00 -04:00
Anton Georgiev
5be5aed1d9
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2020-08-12
2020-08-12 17:12:58 +00:00
Anton Georgiev
614e4dd68f
Remove event: from welcomeMessage link
...
Obsolete in html5 and also was breaking the message sanitizer
2020-07-29 17:24:08 -04:00
Anton Georgiev
0d6faa0b57
only allow for https uri in welcome and modOnly messages
2020-07-29 16:08:47 -04:00
Anton Georgiev
c6669d1d7a
Merge branch 'develop' into move-guest-wait
2020-07-28 13:50:04 -04:00
Tiago Jacobs
153c59307d
Improvements on bbb-libreoffice
2020-07-24 02:42:51 -03:00
Jesus Federico
56403c31a0
enable post_events by default by setting keepEvents=true ( #10097 )
2020-07-20 08:11:02 -04:00
Tainan Felipe
1c8677d7d8
Move guest wait from bbb-client to bbb-html
2020-07-02 17:14:49 -03:00
Pedro Beschorner Marin
de40885768
Define API's voice bridge error
2020-06-16 17:01:57 -03:00
Anton Georgiev
56e16d79a3
Merge pull request #9251 from elor/fix-voicebridge-collision
...
Fix voiceBridge collision (Issue #9024 )
2020-05-28 16:17:59 -04:00
Anton Georgiev
c9e996de21
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop
2020-05-25 17:32:24 +00:00
Anton Georgiev
201fa2902e
Only provide modOnlyMessage to moderators. Promoted mod requires refresh to see it
2020-05-20 15:56:44 -04:00
Anton Georgiev
cc79c4b6ae
merge 2.2.10 into 2.3
2020-05-05 19:52:44 +00:00
Richard Alam
f876ce01c2
Rework presentation download and upload
...
- verify presentation and meeting id formats
- construct presentation file path making sure that they are valid
- add "downloadable" flag to check if presentation can be downloaded or not
- collect presentation upload errors so we can send to the client in the future
2020-05-01 14:16:42 -07:00
Ghazi Triki
84ba925014
Improve the file download in the browser.
2020-04-30 15:41:06 +01:00
Anton Georgiev
4f786f7f03
Merge pull request #9257 from lkiesow/https-links
...
Switch To HTTPS Links
2020-04-27 13:58:25 -04:00
Ghazi Triki
b21ca8355a
Return 404 error when the file download is not allowed.
2020-04-25 19:51:17 +03:00
Lars Kiesow
6e6f9cbb51
Switch To HTTPS Links
...
This patch switches to HTTPS for the links configured for and displayed
in the client.
2020-04-25 18:28:53 +02:00
Erik E. Lorenz
868374516e
Check for existing voicebridge in ApiController
2020-04-25 09:35:29 +02:00
Erik E. Lorenz
bccf3664db
Guarantee unique meeting TelVoice (API create)
2020-04-25 08:51:37 +02:00
Mitsutaka Sato
79361bd485
Set content-type for presentation download, to prevent vulnerable files from being executed
2020-04-16 11:39:49 +12:00
Ghazi Triki
78c649650e
Strip HTML tags from name and fullName API params.
2020-04-03 20:00:33 +03:00
Anton Georgiev
8129468300
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merging
2020-03-04 23:36:21 +00:00
Richard Alam
251b3c20dd
- move location of presentation page blank files
2020-03-04 10:05:36 -08:00
Richard Alam
6c841ce772
- cleanup
2020-03-02 09:42:43 -08:00
Richard Alam
4f453c4026
- add option to skip office pre-check
2020-03-02 09:40:01 -08:00
Richard Alam
673cbb9cac
- downscale pdf page larger than 2MB
2020-03-01 08:24:20 -08:00
Anton Georgiev
3754d0ab6f
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-master-feb-28-2020
2020-02-28 17:47:06 -05:00
Richard Alam
c0372e3a97
Merge branch 'blank-presentation' of https://github.com/riadvice/bigbluebutton into riadvice-blank-presentation
2020-02-28 13:32:02 -08:00
Richard Alam
e2a4bf3bb2
Turn off png generation
...
Turn off png generation as we don't use it.
2020-02-27 16:57:13 -05:00
Richard Alam
859c6a2220
- clean up
...
- addjust timeouts
2020-02-27 13:37:42 -08:00
Richard Alam
3a5b990e4a
- turn off png generation
...
- setup number of processing threads
2020-02-27 13:30:55 -08:00
Richard Alam
5428e86448
- try to process multiple presentations in parallel
2020-02-26 14:36:04 -08:00
Richard Alam
f4a4b8be5d
- downscale large pdf page
2020-02-25 14:18:56 -08:00
Ghazi Triki
0c96050fde
Improvements to conversion default fall-back files and process.
2020-02-22 18:26:50 +01:00
Richard Alam
db4dc4aff0
- add urls on presentation page conversion message
2020-02-18 14:03:08 -08:00
Anton Georgiev
60e3e7986c
Merge pull request #8499 from pedrobmarin/waiting-guests-clean
...
Removes waiting guests that stop polling for their status
2020-01-29 17:40:19 -05:00
Pedro Beschorner Marin
397041efcc
Removes waiting guests that stop polling for their status
2020-01-15 12:03:52 -03:00
Pedro Beschorner Marin
ec7785ff22
Check for maxParticipants before registering an user
2019-12-18 16:12:30 -03:00
Pedro Beschorner Marin
b11113c165
Remove meeting inactivity monitor
2019-12-11 17:11:57 -03:00
Ghazi Triki
ba109530ae
Disallow converting PDF files that have at least one big weighted page.
2019-10-16 08:37:03 +01:00
Chad Pilkey
027c28c320
add lock setting option to hide viewers from each other
2019-08-09 16:45:26 -07:00
Pedro Beschorner Marin
517e252901
Fix on getting caption file content type
2019-07-17 18:47:31 +00:00
Fred Dixon
2bd95f7596
Set default URL to http for testing
2019-06-23 17:23:35 -05:00
Richard Alam
ff6c5e4d7c
Merge pull request #7639 from riadvice/html5-conversion-progress
...
Display SVG conversion progress
2019-06-17 12:35:17 -04:00
Ghazi Triki
2f571eab10
Display SVG conversion progress.
2019-06-17 18:49:25 +03:00
Richard Alam
67ca66c842
Merge pull request #7565 from pedrobmarin/401-guest-false
...
Avoid checking for authentication
2019-06-14 11:03:53 -04:00
Richard Alam
e3dee6d7a2
- turn on svg generation by default while swf is turned off by default
2019-06-07 13:37:24 -07:00
Richard Alam
19caf3a386
Merge branch 'fix-recording-swf-disabled' of https://github.com/riadvice/bigbluebutton into riadvice-fix-recording-swf-disabled
2019-06-07 09:14:11 -07:00