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

1953 Commits

Author SHA1 Message Date
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
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
Anton Georgiev
d3c26d6403
Merge pull request #12124 from gustavotrott/presentation-rasterize-slides 
Implements forceRasterizeSlides and pngWidthRasterizedSlides
 2021-04-23 13:51:17 -04:00
Richard Alam
49ed89d82c - add alternative way of running bbb-web in dev environment which doesn't 
require to be run with user bigbluebutton.
 2021-04-23 17:22:41 +00: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
Anton Georgiev
ef337acbe6
Merge pull request #11956 from gustavotrott/upload-maxsize-error 
Creates a pubSub error message when Upload max size exceeded
 2021-04-09 16:41:22 -04: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
Anton Georgiev
8122caf85a
Merge pull request #11884 from MarcelWaldvogel/exec-service-process 
Services run as starting PID
 2021-04-05 12:16:16 -04:00
Marcel Waldvogel
9140613a96 Services run as starting PID 
The starting scripts now `exec` the main service instead of starting
it as a subprocess. Also in line with docker-entrypoint recommendations.
 2021-04-05 12:24:29 +02: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
Joao Siebel
9981b021ef Merge remote-tracking branch 'upstream/develop' into merge-2.2 2020-06-22 09:00:43 -03:00
Pedro Beschorner Marin
de40885768 Define API's voice bridge error 2020-06-16 17:01:57 -03:00
Joao Siebel
3e95ed0e4b Merge remote-tracking branch 'upstream/v2.2.x-release' into merge-2.2 2020-06-16 16:40:56 -03:00
Fred Dixon
0475d4c3b3
Merge pull request #9595 from miztaka/catalyst-fix-xml-injection 
Fix XML(Formula) Injection
 2020-06-02 10:24:00 -04:00
Anton Georgiev
3a9173297b
Merge pull request #8502 from Fenn-CS/secure-gradle-source 
http => https to prevent 403 access denied during gradle download
 2020-05-28 16:46:43 -04: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
Mitsutaka Sato
e5349d9b27 Fix XML(Formula) Injection 2020-05-19 08:56:00 +12: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
Richard Alam
e805e7a3d2 Bind to localhost 
Made a mistake of defining param twice
 2020-04-24 15:05:17 -07:00
Richard Alam
b30a8093d1 Bind to localhost 
Make bbb-web bind to localhost
 2020-04-24 14:29:36 -07: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
5ebdf5ca77 Improve nginx matching on incoming URLs 2020-04-09 21:40:33 +03: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
Richard Alam
f8437fb19d Merge branch 'v2.2.x-release' of https://github.com/bigbluebutton/bigbluebutton into pres-url-on-page-convert 2020-03-01 05:38:04 -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
Ghazi Triki
64d08d69c7 Updated java projects dependencies versions. 2020-02-28 10:44:28 +01: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
fenn-cs
6a204f0826 http => https to prevent 403 access denied during gradle download 
Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
 2020-01-16 13:45:51 +01: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
Richard Alam
6e7ece7a9f - minor cleanup 2019-06-06 15:16:43 -07:00
Richard Alam
a46d0b9680 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into captions-text-tracks-intermediate-branch 2019-06-06 15:04:53 -07:00
Richard Alam
5d9f72ae21 - add single use token to request for the text track 2019-06-06 14:54:31 -07:00
Richard Alam
7577bf5310 - check if lang param is valid 2019-06-06 07:21:54 -07:00
Richard Alam
c92bfbb591 - deploy recording scripts in proper location 
- log upload captions params
 2019-06-04 14:07:10 -04:00
Pedro Beschorner Marin
a32037baa3 Avoid checking for authentication 2019-06-03 18:06:11 -03:00
Richard Alam
8db3903942 - add checksum check on put recordings text track api 2019-06-03 12:59:37 -07:00
Richard Alam
08f0c2b4e7 - make changes to align closer to spec document 2019-06-03 11:59:20 -07:00
Fred Dixon
63c36cb5d3
Set bigbluebutton.web.serverURL to http by default 2019-06-02 21:30:29 -04:00
Richard Alam
9d416ee473 Merge branch 'text-tracks' of https://github.com/riadvice/bigbluebutton into riadvice-text-tracks 2019-05-30 12:30:07 -07:00
Ghazi Triki
ddb02f57e7 Validate recordID in putRecordingTextTrack. 2019-05-22 16:18:57 +03:00
Ghazi Triki
05cc75eabf Validate kind in putRecordingTextTrack. 2019-05-21 17:58:31 +03:00
Ghazi Triki
6667360cfe Validate locale in putRecordingTextTrack. 2019-05-21 17:41:09 +03:00
Richard Alam
2e3350cc5c
Revert "Create API returns now returns error when no passwords provided for meeting" 2019-05-20 16:39:45 -04:00
Ghazi Triki
deae4bc831 Fix svgImagesRequired, generatePngs and swfSlidesRequired flags. 2019-05-15 18:50:28 +01:00
Ghazi Triki
7c5727750f Merge remote-tracking branch 'bigbluebutton/master' into text-tracks 2019-05-13 14:46:20 +01:00
Ghazi Triki
dbd86eb096 Code improve. 2019-05-10 15:51:05 +01:00
Fred Dixon
056ef6ee8c
Merge pull request #7327 from ritzalam/add-redis-password-on-master 
Add redis password on master
 2019-05-09 16:35:42 -04:00
Ghazi Triki
1974f903ea Fix downloaded file encoding. 2019-05-09 17:35:10 +01:00
Fred Dixon
b2dc8bd4c6
Merge pull request #7384 from riadvice/mandatory-api-passwords 
Create API returns an error when no password parameter is provided
 2019-05-09 06:28:35 -04:00
Ghazi Triki
b469f8c642 Update error format for Create API returns if none of the passwords parameters are provided. 2019-05-09 07:26:20 +01:00
Pedro Beschorner Marin
9867aa6b78 Shared notes lock settings first commit 2019-05-08 20:36:36 +00:00
Ghazi Triki
8892389234 Create API returns an error when no password parameter is provided. 2019-05-08 17:35:00 +01:00
Ghazi Triki
0c46ef2ae6 Revert "Change RecordingController.groovy EOL" and delete unused import. 2019-05-07 18:32:07 +01:00
Ghazi Triki
7f051b2845 Change RecordingController.groovy EOL 2019-05-07 18:30:18 +01:00
Ghazi Triki
f1a83c4022 Update RecordingController.groovy indentation to two spaces instead of four. 2019-05-07 18:28:47 +01:00
Richard Alam
52964f9e6b - put allow duplicate external userids behind a flag so we can enable/disable 2019-05-03 09:15:14 -07:00
Pedro Beschorner Marin
a0590c12ea Merge remote-tracking branch 'origin/master' into set-lock-settings-on-meeting-create 2019-05-02 11:05:34 -03:00
Ghazi Triki
b6e8dfee95 Update RecordingController to work in the current version of grails. 2019-05-01 18:43:30 +01:00
Ghazi Triki
eef047d4e3 Implement getRecordingTextTracks. 2019-05-01 16:14:10 +01:00
Richard Alam
bf7898225b - minor cleanup 2019-04-30 12:30:59 -07:00
Pedro Beschorner Marin
324681d5b2 Renamed unmuteUsers to allowModsToUnmuteUsers 2019-04-23 12:30:55 -03:00
Ghazi Triki
cd3edb4491 Read generated caption files description using getRecordingTextTracks API. 2019-04-22 20:30:00 +01:00
Pedro Beschorner Marin
50afb24653 Changed from unmute only viewers to unmute anyone 2019-04-17 10:55:01 -03:00
Pedro Beschorner Marin
87435c515c Merge remote-tracking branch 'master' into set-lock-settings-on-meeting-create 2019-04-12 13:58:58 -03:00
Pedro Beschorner Marin
5f011f2e2e Included unmuteViewers param on create 2019-04-10 17:55:24 -03:00
Richard Alam
a33271bc09 - make akka-apps and bbb-web work with redis password 2019-04-04 14:38:53 -07:00
Richard Alam
f2098bc376 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into ritzalam-add-redis-password-on-v2.2-dev 2019-04-02 10:43:46 -07:00
Richard Alam
0f93ce4a38 - store the client url instead of joinviahtml5 info into user session. That 
way we can preserve the client url form the join and don't have to recreate
   in the guestWaitHandler
 2019-03-28 13:46:53 -07:00
Richard Alam
86a10b6c77 - handle when forced to join html5 using bigbluebutton.properties and need to wait for approval 2019-03-28 11:41:32 -07:00
Richard Alam
cbd68df5ee - flag the user to join using html5 2019-03-28 11:27:47 -07:00
Richard Alam
0d217447eb - check if guest user waiting for mod approval is joining via html5 2019-03-28 11:24:02 -07:00
Richard Alam
3b4a10ebd5 - do not override settings from config.xml unless an override param is passed on create api call 2019-03-27 08:15:01 -07:00
Richard Alam
7d9adaee30 - return breakout rooms options on enter api 2019-03-26 12:15:10 -07:00
Richard Alam
a63f7dccc3 - allow passing of breakout and lock settings params on create API 2019-03-26 10:57:50 -07:00
Richard Alam
9801efb95a - make user inactivitiy audit disabled by default 2019-03-25 12:39:09 -07:00
Richard Alam
547249b475 - set meeting inactivity check to zero as default which disables the check. When set to 
zero, the meeting won't end due to inactivity.
 2019-03-25 10:10:03 -07:00
Ghazi Triki
48ca58ea3e Fix API variables formatting for meeting endTime and duration. 2019-03-25 13:41:14 +01:00
Fred Dixon
4e6da349d2
Update link for tutorial videos for HTML5 2019-03-22 15:05:50 -04:00
Richard Alam
3cda13b145 Merge branch 'flash-deprecation' of https://github.com/riadvice/bigbluebutton into riadvice-flash-deprecation 2019-03-16 07:54:16 -07:00
Anton Georgiev
3290458649 updated .gitignore for bbb-web and bbb-html5 2019-03-14 16:43:48 +00:00
Ghazi Triki
04b8ae7366 Add commons-compress dependency to pres-checker project. 2019-03-13 15:57:14 +01:00
Ghazi Triki
5482fa07f9 Added a new flag to switch SWF files conversion on and off. 2019-03-06 19:07:28 +01:00
Richard Alam
361776a2fe - signout api throwing exception when it cannot find the user session 2019-02-12 14:12:46 -08:00
Richard Alam
e85e48c64a - fix json response format for stuns and enter api 2019-02-11 14:38:15 -08:00
Fred Dixon
e26df7cf06
Merge pull request #6754 from riadvice/fix-stun-turn 
Fix API stuns call
 2019-02-10 22:57:08 -08:00
Ghazi Triki
b2a4b1efbe Fix API stuns call. 2019-02-11 07:56:13 +01:00
Richard Alam
7185eae79b - make easy to collect data from logs 2019-02-09 19:09:32 -08:00
Richard Alam
2408951946 - put log into single line 2019-02-09 09:43:29 -08:00
Richard Alam
4c5bd2df7e - set the bbb-web port to 8090 2019-02-09 08:36:27 -08:00
Richard Alam
7c76930feb Merge branch 'authenticate-sfu-pad-connections' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-authenticate-sfu-pad-connections 2019-02-09 08:27:12 -08:00
Ghazi Triki
99aa2b5fcc Use the right bigbluebutton user for recording directories. 2019-02-08 17:53:57 +01:00
Richard Alam
df289e241d - update doc to build and run bbb-web during development 2019-02-07 08:05:50 -08:00
Ghazi Triki
e30a37db26 Add settings.gradle for pres-checker project. 2019-02-06 16:09:59 +01:00
Pedro Beschorner Marin
b5427737d7 Includes a minimal authentication step before SFU connections 2019-02-06 09:37:05 -02:00
Richard Alam
7bf7adf145 - run on a different port (8090) 2019-02-05 14:18:27 -08:00
Richard Alam
d92d7f1703 - add location of bigbluebutton.properties 2019-02-05 13:54:45 -08:00
Richard Alam
5783da21a2 - add instructions on how to run the app 2019-02-05 13:52:28 -08:00
Richard Alam
86761ee154
Upgrade gradle and grails 
Add instructions to upgrade gradle and grails.
 2019-02-05 16:17:12 -05:00
Richard Alam
2a786cd452 - separate building and running as most of the times, we don't need to re-run bringing in jars and configs. 2019-01-25 12:25:16 -08:00
Richard Alam
2e7989683e Merge branch 'grails-gradle-update' of github.com:riadvice/bigbluebutton into grails-gradle-update 2019-01-25 12:13:45 -08:00
Richard Alam
f6b690b36c - add max file upload limit 2019-01-25 12:11:18 -08:00
Ghazi Triki
99b65fbc69 Added README.md to bigbluebutton-web. 2019-01-25 17:24:06 +01:00
Richard Alam
b84b5d8552 Merge branch 'grails-gradle-update' of https://github.com/riadvice/bigbluebutton into riadvice-grails-gradle-update 2019-01-25 08:06:46 -08:00
Ghazi Triki
9cf304ec80 Updated bigbluebutton-web/build.sh to match gradle 3 commands. 2019-01-25 08:18:53 +01:00
Fred Dixon
566b245e3c
Merge pull request #6385 from pedrobmarin/keep-meeting-events 
Created property keepEvents at bbb-web to make redis record the event…
 2019-01-24 21:47:50 -05:00
Ghazi Triki
d5091ef61b Added unit test for join API. 2019-01-24 08:42:14 +01:00
Ghazi Triki
cbcf9315a0 Improved response handling in ApiControllerSpec and added unit test for join. 2019-01-22 11:50:33 +01:00
Ghazi Triki
a11ce7732e Implemented unit tests for create API. 2019-01-21 21:58:16 +01:00
Ghazi Triki
8a985e8785 Implemented the first unit test for API version. 2019-01-17 18:29:44 +01:00
Ghazi Triki
68e6468c34 Fix guestWaitHandler in ApiController.groovy 2019-01-17 14:21:22 +01:00
Ghazi Triki
5aa3b04008 Fix log file name. 2019-01-17 13:58:14 +01:00
Ghazi Triki
5fc13c3447 Load freemaker templates whether the application runs within a JAR file or outside of it. 2019-01-17 11:39:50 +01:00
Ghazi Triki
728491ae8d Use logback.xml for bigbluebutton-web. 2019-01-15 14:37:45 +01:00
Ghazi Triki
de17942501 Fix mapping for swf files. 2019-01-15 11:36:49 +01:00
Ghazi Triki
d38f55b30a Improve groovy code formatting. 2019-01-15 11:03:07 +01:00
Ghazi Triki
dcb0544897 Update XML and JSON responses for ApiController. 2019-01-14 14:29:19 +01:00
Ghazi Triki
302a05528e Fix API XML responses. 2019-01-10 21:18:15 +01:00
Ghazi Triki
4a4edd0ca6 Update bigbluebutton-web to gradle 5.1 (Work In Progress) 2019-01-09 21:06:09 +01:00
Anton Georgiev
47dffd5f3a add parenthesis to improve readability 2019-01-08 21:47:08 +00:00
Anton Georgiev
c9505ff56a set allowRequestsWithoutSession=false by default 2019-01-08 19:56:50 +00:00
Anton Georgiev
79ecdf56e8 BBB-web: add allowRequestsWithoutSession=false to handle stripped JSESSIONID 2019-01-08 19:54:08 +00:00
Richard Alam
05c7b5f7e7 Merge branch 'v2.2-dev' into merge-with-v2.2-dev 2018-12-14 15:08:47 -08:00
Richard Alam
11379cab49 merging adding redis password into v2.2-dev 2018-12-14 08:46:04 -08:00
Pedro Beschorner Marin
ebffcb0848 Created property keepEvents at bbb-web to make redis record the events for all meetings 2018-12-11 18:37:31 -02:00
Richard Alam
cb0d282451
Merge pull request #6293 from riadvice/redis-refactor 
Refactor redis implementation in server applications
 2018-12-09 10:33:31 -05:00
Ghazi Triki
fd959f9e14 Remove rediscala library and replace it by a lettuce implementation. 2018-12-05 20:21:06 +01:00
Richard Alam
0a14991955 - add redis password to bbb-web 2018-11-30 07:52:16 -08:00
Chad Pilkey
0fe8e3a38a
Lock enter and stuns to valid session+token 2018-11-22 14:39:25 -05:00
Ghazi Triki
d8588da28a Add support for redis password. 2018-11-22 16:02:55 -02:00
Ghazi Triki
35fa440b81 Improve build shell scripts. 2018-11-22 12:53:42 -02:00
Ghazi Triki
e768cbe3c5 Updated red5 applications configuration to accept redis parameters. 2018-11-21 19:31:01 -02:00
Ghazi Triki
fbd1d631d6 Move redis communication classes from red5 applications to bbb-apps-common project. 2018-11-21 10:55:06 -02:00
Ghazi Triki
8e10280614 Fix configuration for akka and bbb-web projects. 2018-11-14 20:18:12 +01:00
Ghazi Triki
5550d4464d Updated bbb-screenshare project to use common redis classes from bbb-common-message. 2018-11-13 16:19:35 +01:00
Ghazi Triki
21cb59487c Move RedisStorageService from bigbluebutton-web to bbb-common-message and replace jedis with lettuce-core. 2018-11-06 18:54:27 +01:00
Ghazi Triki
a52e907593 Fix API calls. 2018-11-02 20:57:54 +01:00
Ghazi Triki
2ca74819ce Improve freemaker templates. 2018-11-02 20:57:33 +01:00
Ghazi Triki
0ff63f9cde Remove HTML escaping in freemaker templates, it is automatic since version 2.3.24 and fixed metadata display. 2018-11-01 21:52:53 +01:00
Ghazi Triki
653fd74440 Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into merge-2.x-release-into-master 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserLeaveReqMsgHdlr.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/HandlerHelpers.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/testdata/FakeTestData.scala
#	bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Office2PdfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeDocumentValidator.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PdfToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/SvgImageCreatorImp.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/TextFileCreatorImp.java
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
#	bigbluebutton-client/src/org/bigbluebutton/core/UsersUtil.as
#	bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
#	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
#	bigbluebutton-client/src/org/red5/flash/bwcheck/app/BandwidthDetectionApp.as
#	bigbluebutton-config/bigbluebutton-release
#	bigbluebutton-html5/client/compatibility/kurento-extension.js
#	bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
 2018-11-01 14:00:54 +01:00
Richard Alam
f895c09362
Merge pull request #6160 from riadvice/fix-multi-pres 
Fix PR #6122
 2018-10-17 15:56:47 -04:00
Ghazi Triki
df7642117e Fix missing parameter for downloadAndProcessDocument method in ApiController.groovy 2018-10-16 18:31:16 +01:00
Richard Alam
ca9fa5dc09 - changing aliases to use meeting_id_2 instead of meeting_id_1 just in case we need to make the URL params different 2018-10-09 09:15:22 -07:00
Richard Alam
f05cb7ddbc Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into improve-log-on-presentation-conversion 2018-10-09 09:13:03 -07:00
Ghazi Triki
41f5249f4e Updated SVG conversion to simplify complex files. 2018-10-04 23:52:57 +01:00
zhu
6eba10da3a
Merge branch 'v2.0.x-release' into v2.0.x-release 2018-09-28 18:19:56 +08:00
zhu
7e42bb7f02 Fix create meeting with multi presentations will set all of them to current 2018-09-28 18:04:37 +08:00
Ghazi Triki
1493470b13 Add filename attribute for file pre-upload using an URL 2018-09-24 16:41:35 +01:00
Richard Alam
063a81b91f - nginx file to server presentation slides. 
Deploy to /etc/bigbluebutton/nginx
 2018-09-20 14:02:02 -07:00
Richard Alam
74cb07f839 - log error when tomcat still serves slides files 2018-09-20 14:01:19 -07:00
Richard Alam
2fe4f555e8 - log meetingId, presId, and page num of slide that's failing to load 2018-09-19 11:46:30 -07:00
Richard Alam
cc6f88d020 - my IntelliJ IDE seems to format differently with Ghazi's 
- fix screenshare redis connection error
 - fix bbb-web create meeting exception when second user joins
 2018-09-13 13:08:49 -07:00
Ghazi Triki
83025a9d5e Merge remote-tracking branch 'bigbluebutton/master' into jvm-quality-improve 
# Conflicts:
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java
 2018-09-12 18:49:25 +01:00
Ghazi Triki
c44e5aebb8 Merge remote-tracking branch 'bigbluebutton/master' into v2.0.x-code-cleanup 
# Conflicts:
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
 2018-09-11 18:07:07 +01:00
Ghazi Triki
b6a5e75459 Down-scale image sized over 2MB. 2018-09-11 12:51:03 +01:00
Anton Georgiev
1462810b96 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0 2018-09-06 22:06:40 +00:00
Felipe Cecagno
8e9a75d149 - reduce size of the bbb-html5 image 
- fix path of the html5 config file to apply METEOR_SETTINGS
- remove TLS from coturn, in order to keep the ssl certificate on traefik only
- configure stun on bbb-web as well
- allow turn domain/address to be different from the server domain
 2018-08-24 17:15:47 -03:00
Felipe Cecagno
a9b88182d8 change bbb-web to allow join without requesting config.xml 2018-08-24 17:15:47 -03:00
Felipe Cecagno
f6fa7e0945 add another property for redis on bbb-web; set freeswitch ip on webrtc-sfu; add volumes to store media files 2018-08-24 17:15:47 -03:00
Felipe Cecagno
232c485762 revert some unneeded changes 2018-08-24 17:15:47 -03:00
Felipe Cecagno
b91c13e054 update instructions and implementation of a working docker-compose (no recordings yet) 2018-08-24 17:15:47 -03:00
Felipe Cecagno
16a59b7e3e push unfinished work on docker 2018-08-24 17:15:47 -03:00
Felipe Cecagno
62311387b8 more changes to configure redis using environment variables 2018-08-24 17:15:47 -03:00
Felipe Cecagno
c2e507713a add a few docker containers definitions and compiled a list of what is still missing 2018-08-24 17:15:47 -03:00
Ghazi Triki
2820178b83 Updated JVM projects dependencies and configuration. 2018-08-05 22:37:11 +01:00
Anton Georgiev
78847f89ad attempt to pull 2.0 into 2.2 2018-07-31 16:18:23 +00:00
Richard Alam
119d1aecf3 - try to make comment clearer on purpose of value setting 2018-07-30 10:00:12 -07:00
Ghazi Triki
c21f5aabad Add new parameter userInactivityThresholdInMinutes to bigbluebutton.properties and improve inactive user warning and eject from server. 2018-07-27 15:02:04 +01:00
Ghazi Triki
5472456e90 Refactor user inactivity messages naming to have two distinct names: UserInactivityInspectMsg and UserActivitySignResponseMsg. 2018-07-25 21:14:38 +01:00
Ghazi Triki
5b34f93daa Move user inactivity configuration parameters to bigbluebutton-web application and rename them to userInactivityLogoutTimerInMinutes and userInactivityResponseDelayInMinutes. 2018-07-25 10:56:55 +01:00
Anton Georgiev
b4b4f32929 pass key->value pairs in "customdata" array 2018-07-24 22:34:53 +00:00
Richard Alam
aef2fe577d
Merge pull request #5889 from kepstin/turn-stun-fix 
Fix comments in turn-stun-servers.xml (v2.2-dev)
 2018-07-20 15:39:17 -04:00
Calvin Walton
4faf1c9231 Fix comments in turn-stun-servers.xml 
When some code was being moved around, it looks like a bad sed command got run
on this file which made the comments/documentation unreadable.

Revert to the previous version of the file.
 2018-07-20 11:21:46 -04:00
Richard Alam
4e215249a5 - allow downloading of presentations with utf-8 filenames 2018-07-18 11:52:11 -07:00
Ghazi Triki
d383fc98f7 Clean unused parameters in ApiController.groovy 2018-07-11 10:36:01 +01:00
Anton Georgiev
f20569aed7 Merge branch 'java-optimise' of github.com:riadvice/bigbluebutton into merge-bbb-web 2018-07-06 17:40:54 +00:00
Richard Alam
fb234ae882 - end meeting after 2 minutes (configrable) after the last authenticated user leaves 2018-07-03 13:48:57 -07:00
Richard Alam
6401bf905d - handle upload of text tracks 2018-06-29 12:27:23 -07:00
Richard Alam
b9dad9ff19 Merge branch 'upload-vtt' of https://github.com/ritzalam/bigbluebutton into ritzalam-upload-vtt 2018-06-28 14:27:16 -07:00
Richard Alam
d891a4e85f Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-latest-20-branch 2018-06-28 08:30:17 -07:00
Anton Georgiev
a6c693c93d add clientType in User and show it in api getMeeting* 2018-06-22 19:19:46 +00:00
Richard Alam
fc3605f301 - merging latest v20-release branch 2018-06-21 07:38:19 -07:00
Richard Alam
788ca15440 Implement end meeting callback url 
To use, add meta_endcallbackurl parameter on the create api call.
 2018-06-20 13:13:44 -07:00
Richard Alam
83ac942452 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 2018-06-08 17:23:49 -07:00
Richard Alam
5df4bef903 - toggle presentation downloads 2018-06-07 12:13:00 -07:00
Richard Alam
a2eaa9babd Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 
- some conflicts have been fixed.

The following needs working on:

       both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatCopy.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatSaver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml

Parking as need to work on something else.
 2018-06-06 08:23:13 -07:00
Richard Alam
228540d638
Change bbb-web dev port 
Change port so as not to conflict with Kurento
 2018-05-31 16:54:32 -04:00
Richard Alam
bd9414e3a9 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into upload-vtt 2018-05-31 11:22:06 -07:00
Richard Alam
2bb3b59b1b - handle put track api request 2018-05-29 07:19:19 -07:00
Richard Alam
2d175cda62 - handle get text tracks call 2018-05-28 07:17:55 -07:00
Richard Alam
3e78309877 - handle get text tracks api call 2018-05-25 12:52:16 -07:00
Richard Alam
4c673d83a9 - setup caption endpoint 2018-05-24 14:33:56 -07:00
Anton Georgiev
e4a6f31abc revert special api changes made for html5 client 2018-05-24 18:42:59 +00:00
Richard Alam
0361f1c5db - add some kind of check to uploaded file 
NOTE: This doesn't fix issue with uploading file with FF 60 on Windows 10.
 2018-05-19 10:01:22 -07:00
Richard Alam
b352ee2c95 - change log timestamp format so they are all the same 2018-05-15 10:50:40 -07:00
Ghazi Triki
54ae79d533 Add new feature to breakout rooms that allows to freely join them. 2018-05-07 16:03:53 +01:00
Richard Alam
384df10746 - generate png files for uploaded presentation 2018-04-10 13:06:08 -07:00
Richard Alam
e981a874c3 - query for guest wait status 2018-02-26 10:51:02 -08:00
Richard Alam
2bb1f23da5 - fix exception when redirect=false and guest has to wait for approval 2018-02-23 15:06:24 -08:00
prlanzarin
750d537618 Updated bbb-web apiVersion to 2.0 2018-02-09 03:22:11 +00:00
Ghazi Triki
a2feb9bf5b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into master-merge-2.0 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingStatus.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
#	bigbluebutton-client/branding/default/style/css/V2Theme.css
#	bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla
#	bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf
#	bigbluebutton-client/locale/en_US/bbbResources.properties
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
#	bigbluebutton-html5/private/config/development/server/log.yaml
 2018-01-23 12:27:42 +01:00
Ghazi Triki
8f47e7b7de Remove webcamsOnlyForModerator from enter API response. 2018-01-09 18:14:58 +01:00
Richard Alam
7637cedd4b Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0 2017-12-21 12:48:20 -08:00
Richard Alam
78afb91562 - implement muteOnstart by passing on create API or using bigbluebutton.properties in bbb-web instead of setting it in config.xml 2017-12-21 10:40:44 -08:00
Richard Alam
d09abe92e4 - allow to pass custom copyright text using create API 2017-12-20 14:28:01 -08:00
Richard Alam
f5502a1a2a - allow passing of custom param (logo) to override default logo 2017-12-20 11:06:00 -08:00