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
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
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
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
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