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

814 Commits

Author SHA1 Message Date
Gustavo Trott
42e32b7ba8 Include infos about meeting endedOn and fix problem where user leftOn was never set if meeting ends before they left 2021-08-02 11:16:08 -03:00
Anton Georgiev
73da9c15da Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-23-july-30 2021-07-30 23:43:27 +00:00
paultrudel
2af81a3a9e fixed issue with guests not joining meeting after being approved 2021-07-30 15:57:30 -04:00
paultrudel
c325713167 null values are now allowed for parameters that are not required 2021-07-30 10:04:17 -04:00
paultrudel
5687842f17 converted boolean input values to lowercase before validating them 2021-07-29 10:38:39 -04:00
paultrudel
0ef55cd592 modified boolean validator to accept 0 and 1 as valid boolean values 2021-07-29 09:58:45 -04:00
paultrudel
4fcf4f991b modified regex pattern to allow international characters in meeting name/id 2021-07-28 09:56:42 -04:00
Marcel Hellkamp
500a1e6ff4 fix(common-web): Sub-processes hang if output buffers fill up 
ExternalProcessExecutor spawned sub-processes with stderr and
stdout buffers, but did not read from those buffers. Sub-processes
producing output sometimes would fill up these buffers and then hang
until the timeout occurs and the process is killed.

This fixes #12839 (PDF conversion hangs for 10 seconds per page)
by properly discarding command output. The patch also deprecates an
outdated and dangerous API and offers a safer alternative. Splitting
command arguments based on whitespace may result in unwanted behavior
if an argument (e.g. a filename) contains whitespace.
 2021-07-28 14:56:26 +02:00
Gustavo Trott
e4ef1582f2
Merge branch 'develop' into activity-report 2021-07-22 11:33:47 -03:00
Gustavo Trott
4e211d70a8 Removes unnecessary comments 2021-07-22 11:13:30 -03:00
Gustavo Trott
3c6155a73e Creates config activityReportTracking to enable Activity Report 2021-07-22 11:09:44 -03:00
Gustavo Trott
b0f9835ffd Merge branch 'develop' into activity-report 2021-07-21 14:20:27 -03:00
Joao Siebel
8462465a5f Allow default layout config in bbb-web. close #12668 2021-07-19 11:02:58 -03:00
paultrudel
4a0f1b773b made voice bridge an optional parameter 2021-07-13 12:30:44 -04:00
paultrudel
43e454fca8 breakout room and record are no longer required parameters for create requests 2021-07-13 11:27:59 -04:00
Gustavo Trott
45d4c310c2 Merge branch 'develop' into activity-report 2021-07-13 11:12:45 -03:00
Anton Georgiev
2c28206ea1
Merge pull request #12564 from gustavotrott/breakoutrooms-set-name 
Adds possibility to give a name to breakout rooms
 2021-07-12 16:30:14 -04:00
Anton Georgiev
8cf5b64a0f
Merge pull request #12693 from paultrudel/update-api-validation 
Updates to BBB-Web API validation
 2021-07-12 16:20:34 -04:00
Gustavo Trott
5c602fd2b0
Merge branch 'develop' into breakoutrooms-set-name 2021-07-12 16:31:38 -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
Gustavo Trott
1d7dcb200a Add improvements in Nginx config 2021-07-09 15:24:08 -03:00
paultrudel
6b9463daf8 added type conversion check for createTime parameter in join meeting 2021-07-07 11:44:55 -04:00
paultrudel
af32ac984d added new constraints to ensure proper data format 2021-07-05 14:08:56 -04:00
paultrudel
5db8c769c2 fixed freemarker getSessions null error 2021-07-02 10:57:45 -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
0417cbb03f Adds Activity Dashboard initial version and generate activityReportAccessToken 2021-06-30 00:01:46 -03: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
Max Franke
4757107f6f fix(breakout-room): avoid muteOnStart at breakout room 
Quick fix to prevent the moderator who joins the
breakout room from being unable to unmute himself
 2021-06-14 19:28:29 -03:00
Gustavo Trott
37dea2215b Translates dynamically breakout room Names when default name is being used 2021-06-14 16:59:27 -03:00
Anton Georgiev
06b73419a6 fix: endWhenNoModerator* passed meetingCreate params should override default values 2021-06-03 19:46:57 +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
Joao Siebel
eedf3a00f2 Remove stripHTMLTags method 2021-05-31 13:14:39 -03: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
ced0cc0b26 removed configXML from bbb-web 2021-05-22 16:13:29 +00:00
Gustavo Trott
00240c925e Implements endWhenNoModerator 2021-05-17 17:52:59 -03:00
Gustavo Trott
7ab6a2c4c9 Detects if PDF contains font Type 3 and rasterize automatically 2021-04-28 15:47:55 -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
3e675af3b5 Akka broadcasts UploadedFile Too Large error msg 2021-04-08 16:49:17 -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
8a1d5ba8a0 Handle and log timeout error during Office2Pdf conversion 2021-03-31 14:21:00 -03:00
Gustavo Trott
64d3afbb1c Changes timeout error text 2021-03-31 14:19:47 -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
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
Anton Georgiev
d131b0a7bf
Merge pull request #11717 from gustavotrott/develop 
Adds a customizable "office to pdf" converter for presentations
 2021-03-29 17:08:49 -04:00
Gustavo Trott
eab8e6488a Use of ProcessBuilder instead of Runtime.exec 2021-03-29 17:44:46 -03:00
Tiago D J
cab865c913
Quick fix to avoid empty slides 
This PR reduces the impact of #8618 by increasing hardcoded timeout from 7s to 60s

A subsequent PR is going to be sent by @gustavotrott to:

-> Make this timeout configurable;
-> Add a log telling that timeout happened
 2021-03-25 12:09:44 -03:00
Gustavo Trott
a69baba177 Removes jodconverter from project dependencies 2021-03-24 15:00:05 -03:00
Gustavo Trott
5c1271cf0d Removes files and codes not used anymore 2021-03-23 18:37:37 -03:00
Gustavo Trott
2f56f7415d Improves error handling 2021-03-23 10:46:39 -03:00
Gustavo Trott
1a6457f178 Adds presentation script path as parameter 2021-03-22 17:37:49 -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
8302159255
Revert "Add getter for defaultKeepEvents" 2021-03-21 22:21:52 -04:00
Anton Georgiev
f8149578bd
Add getter for defaultKeepEvents 
Follow up to #11681
 2021-03-21 21:43:50 -04: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
Richard Alam
28245a1b58
Merge pull request #11557 from aron-2809/bbb-core-http-endpoint-wip 
Bbb core http endpoint wip
 2021-03-05 14:27:48 -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
Aron Engineer
cae124aed7 feat: pubsub send and receive statuses added to health endpoint 2021-03-04 21:16:48 +00:00
Pedro Beschorner Marin
f02384bb1f Fix padId getter 
Pad exporter uses this same location to serve pad's downloaded content
but the the match was failing because padId is not the last element
of the URL on that scenario.

Pattern follows /pad/p/<padID>[/export/(format)]?<query>.
 2021-03-03 20:36:19 -03: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
Anton Georgiev
363c801338
Merge pull request #11215 from pedrobmarin/guest-draft 
Disable authenticated guests
 2021-02-05 16:13:46 -05:00
Anton Georgiev
4459b11f78
Merge pull request #8907 from lkiesow/8900-dollar-in-room-name 
Fix Special Characters in Room Names
 2021-02-03 16:40:59 -05:00
Anton Georgiev
09e6ba8dfd Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-Jan30 2021-01-29 20:58:05 +00:00
Pedro Beschorner Marin
7e26e78c4f Cleanup from authenticated guests removal 
While cherry-picking some of this work I noticed those extras.
 2021-01-23 22:22:52 -03:00
Pedro Beschorner Marin
0bbef12ac7 Authenticated guests feature controlled at bbb-web properties 2021-01-23 21:48:02 -03:00
Pedro Beschorner Marin
ca7e3baf0f Check if stream already exists before adding in list 2021-01-08 13:48:36 -03: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
Mario Jr
70456ef93d Set listenOnly to false when user left voice 
The message/event UserLeftVoiceConfToClientEvtMsg is used when user leaves mic and listenonly, but it only sets to false the 'voiceJoined' (which represents the <hasVoiceVoiceJoined> property in BBB's XML API.
We now also set to false the 'listeningOnly' (which represents the <isListeningOnly> property in BBB's XML API). Setting both to false is not a problem, once 'MIC' and 'ListenOnly' states are mutually exclusives
Fixes #10852
 2020-11-18 11:55:32 -03: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
Tiago D J
db413c59e9
Update OfficeToPdfConversionService.java 2020-10-08 18:13:55 -03: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
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
f2c307932f Remove maxInactivity added in merge from 2.2.24 2020-09-18 18:12:42 +00: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
Tiago Jacobs
153c59307d Improvements on bbb-libreoffice 2020-07-24 02:42:51 -03:00
Pedro Beschorner Marin
49236ac3d0 Avoid wrongly naming a thumbnail as thumb-1 2020-07-13 19:58:02 -03:00
Fred Dixon
22f88bf8d0
Merge pull request #9977 from tdjac0bs/bbb_libreoffice_container 
Detach libreoffice from bbb-web ( running as a docker container )
 2020-07-02 16:07:58 -04: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
Pedro Beschorner Marin
d8183b3abd Fix string compare 2020-06-16 16:28:27 -03:00
Tobias Gall
00aec57ca0 Fix missing leading zeros in conference number 
Rewrite is to use only string manipulation as converting to Int removes leading zeros.

fixes #9769
 2020-06-08 11:34:43 +02:00
Tiago Jacobs
d7ab880bcc Use external pool of soffice processes 2020-06-04 01:47:00 -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
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
d1924c5bb2
Revert "Fix calcGuestStatus" 2020-05-26 09:28:00 -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
Richard Alam
6943fef65c Format conference num 
- separate conf num with space instead of dash

 Initial work on more flexible formatting is being done in
  https://github.com/ritzalam/bigbluebutton/tree/format-voice-conf-number

 This just addresses complaints on mailing list that separating using '-'
 is confusing.
 2020-05-21 05:01:21 -07:00
Mitsutaka Sato
e5349d9b27 Fix XML(Formula) Injection 2020-05-19 08:56:00 +12:00
Lars Kiesow
1849b4c1c8
Fix Special Characters in Room Names 
This patch fixes the issue that regexp special characters like `$` in a
room name cause an error when trying to enter the room.

This fixes #8900
This fixes #4671
 2020-05-18 02:57:56 +02:00
Anton Georgiev
b70ee28a31
Merge pull request #9189 from miztaka/catalyst-fix-calcGuestStatus 
Fix calcGuestStatus
 2020-05-06 09:11:46 -04:00
Anton Georgiev
cc79c4b6ae merge 2.2.10 into 2.3 2020-05-05 19:52:44 +00:00
Richard Alam
5cde97b139 Reweork file upload and download 
- fix filename regex
 - create download flag when uploading file with that can be downloaded
 2020-05-02 04:51:32 -07: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
481afb514d Check path for file to download. 2020-04-30 15:44:08 +01:00
Ghazi Triki
84ba925014 Improve the file download in the browser. 2020-04-30 15:41:06 +01:00
Richard Alam
0877d8379a Format conference numbers 
- add dashes to conference numbers so it is easier to read
 2020-04-28 18:27:54 -07:00
Ghazi Triki
b21ca8355a Return 404 error when the file download is not allowed. 2020-04-25 19:51:17 +03:00
Erik E. Lorenz
535016dddc Don't create duplicate telvoice/webvoice meetings 2020-04-24 17:29:26 +02:00
Erik E. Lorenz
69164169a8 Add telVoice query functions to MeetingService 
* getNotEndedMeetingWithTelVoice()
* getNotEndedMeetingWithWebVoice()
 2020-04-24 17:25:51 +02:00
Mitsutaka Sato
b256b55c3e Fix calcGuestStatus 2020-04-22 15:10:42 +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
4f453c4026 - add option to skip office pre-check 2020-03-02 09:40:01 -08:00
Richard Alam
92970a612d - downscale large pages 2020-03-01 08:22:43 -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
eb48875f7e - remove unused file 2020-02-27 13:40:57 -08:00
Richard Alam
859c6a2220 - clean up 
- addjust timeouts
 2020-02-27 13:37:42 -08:00
Richard Alam
518fb12341 - send end completion for image presentation 2020-02-26 14:46:58 -08:00
Richard Alam
5428e86448 - try to process multiple presentations in parallel 2020-02-26 14:36:04 -08:00
Richard Alam
70b93bdcc8 - cleanup 2020-02-26 08:13:03 -08:00
Richard Alam
fb222e0a7f - include page extraction into conversion step 2020-02-25 14:58:34 -08:00
Richard Alam
f4a4b8be5d - downscale large pdf page 2020-02-25 14:18:56 -08:00
Richard Alam
bba17c3a03 - handle pages on page converted messages instead on conversion completed message 2020-02-24 15:00:20 -08:00
Richard Alam
f521f97382 - explode pdf so we can process each page 2020-02-22 09:33:32 -08:00
Ghazi Triki
0c96050fde Improvements to conversion default fall-back files and process. 2020-02-22 18:26:50 +01:00
Richard Alam
ddb8f53852 - run conversion in a completion service 2020-02-21 12:57:40 -08:00
Richard Alam
0c9c9878c8 - figure out filename when converting one pdf page to png 2020-02-20 15:12:32 -08:00
Richard Alam
3864fef3ea - generate proper png and thumb filenames 2020-02-20 13:42:37 -08:00
Richard Alam
7099df132d - handle new messages in akka apps 2020-02-19 15:04:19 -08:00
Richard Alam
96cdf30af7 - do proper page conversion steps 2020-02-19 12:29:01 -08:00
Richard Alam
db4dc4aff0 - add urls on presentation page conversion message 2020-02-18 14:03:08 -08:00
Richard Alam
45f8def0ca - send message when office to pdf conversion failed 2020-02-15 09:13:45 -08:00
Anton Georgiev
4b0452d1fd Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into feb14-merge-2.2-into-master 2020-02-14 21:43:35 +00:00
Tiago D J
e23db63992
Update PresentationUrlDownloadService.java 2020-02-08 01:24:29 -03:00
Richard Alam
4fc677a0b4 Breakout rooms shouldn't call the end meeting callback url 
- add check if the meeting that ended isn't a breakout room and if there is an end-meeting-callback-url.
 2020-02-06 14:50:25 -08: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
b11113c165 Remove meeting inactivity monitor 2019-12-11 17:11:57 -03:00
Anton Georgiev
b3a37d42f7
Merge pull request #8375 from ritzalam/fix-handling-of-redirect-for-callback-2.2-beta-17-based 
- since the endcallbackurl is passed as meta parameter, we expect it…
 2019-11-28 16:39:25 -05:00
Ghazi Triki
cd944d4770 Add missing PdfConversionInvalidErrorEvtMsg event to be sent to the web client. 2019-10-21 13:33:40 +01: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
Richard Alam
f434cc34a2 - since the endcallbackurl is passed as meta parameter, we expect it to be a working 
url and not a redirect.
 2019-07-19 07:59:31 -07:00
Ghazi Triki
2f571eab10 Display SVG conversion progress. 2019-06-17 18:49:25 +03: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
5d9f72ae21 - add single use token to request for the text track 2019-06-06 14:54:31 -07:00
Richard Alam
a8b6717c94 - put captions into temporary file to remove race condition between start of processing and writing contents of file. 2019-06-06 10:03:54 -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
Richard Alam
7fdb920aad - change field names to match json keys 2019-06-03 13:18:27 -07:00
Richard Alam
08f0c2b4e7 - make changes to align closer to spec document 2019-06-03 11:59:20 -07: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
Richard Alam
2e3350cc5c
Revert "Create API returns now returns error when no passwords provided for meeting" 2019-05-20 16:39:45 -04:00
Richard Alam
72d559f4ff - when a bad endcallbackurl is sent and causes exception, we are not handling 
it properly that results in the meeting not being removed from the running
   meeting list
 2019-05-16 14:21:04 -07: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
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
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
17a3af0487 Write playback caption files from the captions file generated for API. 2019-05-07 18:13:09 +01:00
Ghazi Triki
a7c3dd8e80 Fix typo and caption files URL in RecordingMetaXmlHelper.scala 2019-05-07 14:11:50 +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
eef047d4e3 Implement getRecordingTextTracks. 2019-05-01 16:14:10 +01:00
Richard Alam
e3a68f9a97 - cleanup 2019-04-30 13:10:51 -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
b50c22f445 - propagate privateChatEnabled value from parent meeting to breakout room 2019-04-10 13:53:03 -07:00
Richard Alam
f6c0d21fda - pass breakout and lock setting using create meeting message 2019-04-09 14:33:08 -07: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
0d217447eb - check if guest user waiting for mod approval is joining via html5 2019-03-28 11:24:02 -07:00
Richard Alam
6774062ca2 - do not make moderators wait no matter what the guest policy is 2019-03-28 10:35:41 -07:00
Richard Alam
790c9f9629 - fix formatting using scalariform 2019-03-28 07:34:46 -07:00
Richard Alam
09a5a09c67 Merge branch 'master' into set-lock-settings-on-meeting-create 2019-03-28 07:10:52 -07:00
Richard Alam
81d7c117f7 - enable scalariform for bbb-common-web 2019-03-27 13:36:34 -07:00
Richard Alam
e9fa7d5d49 - a little bit of formatting and comment. 2019-03-27 08:20:54 -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
a63f7dccc3 - allow passing of breakout and lock settings params on create API 2019-03-26 10:57:50 -07:00
Ghazi Triki
48ca58ea3e Fix API variables formatting for meeting endTime and duration. 2019-03-25 13:41:14 +01:00
Richard Alam
42982482d8 - fix typo 2019-03-16 08:54:06 -07:00
Richard Alam
b41d25d847 Merge branch 'bbb-conf-clean' of https://github.com/riadvice/bigbluebutton into riadvice-bbb-conf-clean 2019-03-16 08:07:36 -07:00
Ghazi Triki
5a60f62b41 Copy dial number from the parent room to all breakout rooms. 2019-03-11 22:33:34 +01:00
Ghazi Triki
094ecd0e9f Generate text files in all cases. 2019-03-06 19:21:49 +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
Ghazi Triki
2412c94a9c Generate temporary files names using UUID instead of relying on the original file name. 2019-03-06 15:16:18 +01:00
Chad Pilkey
9a07f0abd2 fixed mapping of inactivity values 2019-02-25 12:48:46 -08:00
Richard Alam
0120a7a114
Merge pull request #6750 from ritzalam/retry-callbacks 
- retry end meeting callback in 30ms, 1min, 2min, and 5min if failing
 2019-02-10 21:38:56 -05:00
Richard Alam
bd3fb3f9f7 - retry end meeting callback in 30ms, 1min, 2min, and 5min if failing 2019-02-10 10:37:01 -08:00
Richard Alam
7185eae79b - make easy to collect data from logs 2019-02-09 19:09:32 -08:00
Richard Alam
733923de99 Merge branch 'akka-transcode-update' of https://github.com/riadvice/bigbluebutton into riadvice-akka-transcode-update 2019-02-09 09:04:04 -08:00
Richard Alam
3e286f1ed6
Merge pull request #6473 from zhu/patch-3 
Fix convert jpg with orientation metadata
 2019-02-09 12:03:03 -05:00
Pedro Beschorner Marin
a8237d8827 Fixed typo 2019-02-06 09:38:14 -02:00
Pedro Beschorner Marin
b5427737d7 Includes a minimal authentication step before SFU connections 2019-02-06 09:37:05 -02: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
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
Pedro Beschorner Marin
5ecfbce82a
Information about the ended tag creation order 2019-01-24 19:13:22 -02: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
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
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
79ecdf56e8 BBB-web: add allowRequestsWithoutSession=false to handle stripped JSESSIONID 2019-01-08 19:54:08 +00:00
zhu
b7c64cdc6d
Fix convert jpg with orientation metadata 2018-12-24 19:03:51 +08:00
Ghazi Triki
0bad0747be Update scala, sbt and akka version to the latest. 2018-12-16 20:18:37 +01: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
Richard Alam
367a621ebf
Merge pull request #6360 from pedrobmarin/rebased-redis-recording 
Includes publish/unpublish/delete API calls as Redis events
 2018-12-13 11:25:05 -05: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
Ghazi Triki
9569704254 Exclude red5 dependencies from akka and web projects. 2018-12-10 20:32:08 +01:00
Pedro Beschorner Marin
948576887e Includes publish/unpublish/delete API calls as Redis events 2018-12-10 10:14:02 -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
Pedro Beschorner Marin
d411cd78f4 Display recordings raw size and playbacks sizes at getRecordings API call 2018-12-07 10:54:42 -02:00
Ghazi Triki
114cba670f Improved redis connection logging. 2018-12-06 21:35:51 +01: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
Richard Alam
9030402f24 - add password when connecitng to redis for akka-apps 2018-11-30 07:31:06 -08:00
Tiago D J
7bc7804276
Update PdfToSwfSlidesGenerationService.java 2018-11-29 19:31:38 -02:00
Tiago D J
03cd3e42e7
Fixes presentation slide conversion timeout 
Fixes #6311
 2018-11-29 15:49:14 -02:00
Ghazi Triki
5b8a9a0ace Add password to redis scala classes. 2018-11-23 11:38:28 -02:00
Ghazi Triki
d8588da28a Add support for redis password. 2018-11-22 16:02:55 -02:00
Ghazi Triki
2614ba2cd0 Update deployment configuration. 2018-11-22 12:54:40 -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
Richard Alam
6dcb310a66 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-v20-master-nov16 2018-11-16 13:29:36 -08:00
Richard Alam
67c4a3d7ec - fix issue where we process recording even if meeting is not recorded 2018-11-16 13:10:41 -08: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
fc4028d6de Redis refactoring : remove duplicate classes, factorisation and build configuration update. 2018-11-09 20:19:46 +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
d330c6687b Updated bbb-common-web project to use sbt 1.2.6 and scala 2.12.7 2018-11-06 14:43:03 +01:00
Richard Alam
5f8803917c - change meetingid param to meetingID so it's consistent with how other params are spelled. 2018-11-05 12:03:35 -08:00
Ghazi Triki
0f41551530 Add meetingid GET parameter to endCallbackUrl. 2018-11-03 17:06:16 +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
Ghazi Triki
424a3ffde6 Log exception stack trace in presentation conversion classes using error scope. 2018-10-11 20:06:42 +01:00
Ghazi Triki
1ffccb273d Add process handler to image conversion in SvgImageCreatorImp.java 2018-10-10 21:44:24 +01:00
Richard Alam
f780a43c44 - implement data metrics on metadata.xml 2018-10-10 11:38:31 -07:00
Richard Alam
44650ca104
Merge pull request #6141 from riadvice/end-callback-recordings 
Add "recordingmarks" to end meeting callback url
 2018-10-09 12:07:45 -04:00
Ghazi Triki
27d1dcd835 Add recordingmarks to end meeting callback url. 2018-10-08 19:51:44 +01:00
Ghazi Triki
2bb72f0559 Fixed typos in class names. 2018-10-05 11:13:49 +01:00
Ghazi Triki
bd3c829fac Fixed typos in class names. 2018-10-05 00:45:38 +01:00
Ghazi Triki
41f5249f4e Updated SVG conversion to simplify complex files. 2018-10-04 23:52:57 +01: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
b6055c70d8 More logging for document conversion error. 2018-09-11 15:55:46 +01:00
Ghazi Triki
dbf85bb597 Remove dev debug. 2018-09-11 12:54:37 +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
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
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
ba6e7ad0f3 Minor java improvements. 2018-08-07 10:02:26 +01:00
Ghazi Triki
cb152bf864 Improved java classes code quality. 2018-08-05 22:41:15 +01:00
Ghazi Triki
2820178b83 Updated JVM projects dependencies and configuration. 2018-08-05 22:37:11 +01:00
Richard Alam
524ee0dd2a Merge branch 'user-inactivity-refactor' of https://github.com/riadvice/bigbluebutton into riadvice-user-inactivity-refactor 2018-07-30 07:11:32 -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
Richard Alam
85385206fd - make authenticated non-moderators wait if gues policy is ASK_MODERATOR 2018-07-25 07:06:55 -07: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
Richard Alam
bfe9075e55 - only allow moderators in when guest policy is ASK_MODERATOR 2018-07-20 07:40:29 -07:00
Richard Alam
223f8d99d8 - fix issue where file aside from pdf can be made downloadable 2018-07-18 11:51:00 -07:00
Richard Alam
f33996d038 - when guestPolicy is ASK_MODERATOR, only apply policy to viewer and guest 2018-07-17 10:56:45 -07:00
Richard Alam
c09fd950fe - add back removed method used for making the uploaded presentation downloadble 2018-07-16 13:05:22 -07: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
f62c872353 - make text tracks always a json array 2018-06-29 13:42:59 -07:00
Richard Alam
6401bf905d - handle upload of text tracks 2018-06-29 12:27:23 -07:00
Richard Alam
b9c9120a4e - get caption track 2018-06-28 15:21:06 -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
79329d036a set dial-in clientType in html5 client 2018-06-26 20:50:03 +00:00
Anton Georgiev
e2e83e08df plug clientType in UserJoin* messages, not separate ones 2018-06-26 19:27:42 +00: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
14327a1edf Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-v20-branch 2018-06-19 12:58:51 -07:00
Richard Alam
39d786a2bd - update rec metadata for all formats 2018-06-18 08:46:10 -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
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
Ghazi Triki
54ae79d533 Add new feature to breakout rooms that allows to freely join them. 2018-05-07 16:03:53 +01:00
Pedro Beschorner Marin
ce6ff8bf7c Grouping playbacks inside the same recording at getRecordings API response 2018-05-03 14:06:58 +00:00
Richard Alam
87a8a03067 Merge branch 'change-user-role-bbb-web' of https://github.com/riadvice/bigbluebutton into riadvice-change-user-role-bbb-web 2018-04-24 14:47:53 -07:00
Richard Alam
384df10746 - generate png files for uploaded presentation 2018-04-10 13:06:08 -07:00
Ghazi Triki
b848beb04a Force reading config.xml in utf-8 format. 2018-02-08 20:19:07 +01:00
Ghazi Triki
00734d8018 Store role change in session and registered users then propagate the change from akka-apps to bbb-web. 2018-02-08 19:57:57 +01: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
Richard Alam
9ff881f138
Merge pull request #4925 from riadvice/webcams-only-for-moderator-on-off 
Switch webcamsOnlyForModerator on and off
 2018-01-09 12:48:19 -08:00
Ghazi Triki
9cad3facc3 Set webcamsOnlyForModerator in MeetingActor when the meeting is creator. 2018-01-09 20:47:03 +01:00
Richard Alam
e9df643af4 - fix issue where muteOnStart doesn't work when set in bigbluebutton.properties 2018-01-09 07:46:16 -08:00
Ghazi Triki
4bf5a26ecf Fix setters in Meeting.java 2017-12-29 09:44:16 +01:00
Ghazi Triki
cdab773fe7 More code quality improvements for bbb-common-web. 2017-12-29 09:02:42 +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
Richard Alam
8223a08029 - hardcode logoutTimer to zero as we don't use this feature in the release 
- substitute keyworks in moderatorOnlyMessage
 2017-12-18 12:52:33 -08:00
Ghazi Triki
aa91cf6562 Code quality improve for bbb-common-web project. 2017-12-18 20:54:18 +01:00
Richard Alam
beed7a1058 - make client logout timer configurable in bigbluebutton.properties 2017-12-15 14:59:00 -08:00
Richard Alam
07e9f78730 - do not ask moderator permissions if not guest or authenticated guest 2017-12-14 17:35:52 -08:00
Richard Alam
3e3e661856
Merge pull request #4799 from ritzalam/eject-duplicate-user 
Eject duplicate user
 2017-12-12 10:55:51 -05:00
Richard Alam
9923704012 - eject user with duplicate external userid 2017-12-11 12:51:00 -08:00
Richard Alam
9e7e2a199b - switch how to calc checksum from sha1hex to sha256hex 2017-12-11 11:07:29 -08:00
Richard Alam
715a0177fd Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0 2017-12-08 11:26:09 -08:00
Chad Pilkey
5fc5cdbf8d Merge remote-tracking branch 'upstream/master' into cleanup-akka-apps 2017-12-04 21:42:21 -05:00
Chad Pilkey
158fb6c7b2 cleanup of old java messages and other unused code 2017-12-04 12:31:16 -05:00
Anton Georgiev
d6e8396407 add configuration to join via html5 for attendee or mod 2017-11-30 15:19:03 -05:00
Richard Alam
35277b7447 - remove unused imports 2017-11-28 10:54:58 -08:00
Richard Alam
5bf8258074 - make max file uploaded presentation 2017-11-27 14:03:50 -08:00
Richard Alam
9329e9316b - determine guest status properly for moderators 2017-11-15 12:39:06 -08:00
Anton Georgiev
84df0dfdd4
Merge pull request #4646 from ritzalam/fix-chat-issues 
Fix chat issues
 2017-11-09 13:46:31 -02:00
Richard Alam
42b96e370d - propagate guest policy change to bbb-web 2017-11-05 20:21:42 -08:00
Richard Alam
4a5e4d4238 - cleanup 2017-11-03 08:38:49 -07:00
Richard Alam
9f28f240a5 - hardcode default presentation window for pre-uploaded presentations and for creation of breakout rooms 2017-10-30 13:05:06 -07:00
Richard Alam
f2709d7294 - stop start recording of webcam 2017-10-24 18:31:09 -07:00
Richard Alam
8939902143 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into implement-multi-chat 2017-10-24 13:24:38 -07:00
Richard Alam
e02189b922 - fix https://github.com/bigbluebutton/bigbluebutton/issues/4541 2017-10-24 13:08:47 -07:00
Richard Alam
3e15405966 - show voice only users in get meeting api response 2017-10-24 12:59:09 -07:00
Richard Alam
1f99106ba1 - write chapter break done file to kick off processing 2017-10-23 13:31:07 -07:00
Richard Alam
53f1225c32 Merge branch 'v2.0.x-release' into synch-with-2.0.x-release 2017-10-12 11:32:54 -07:00
Pedro Beschorner Marin
5dfd772654 Updating presenter status 2017-10-10 14:38:27 -03:00
Anton Georgiev
b4210ea12f enable presentation token storage in bbb-web 2017-10-04 18:38:28 -04:00
Richard Alam
a3e37dffa5 Merge branch 'information-bar' of https://github.com/riadvice/bigbluebutton 2017-10-03 14:04:12 -07:00
Ghazi Triki
e96d6ae726 Add new API options to display a banner in the client. 2017-10-03 21:49:06 +01:00
Anton Georgiev
d521b19623 Merge branch 'implement-multi-chat' of github.com:ritzalam/bigbluebutton into pods_vol3 2017-10-03 11:13:48 -04:00
Anton Georgiev
23dadc5477 work on separating pods - client/conversion/apps 2017-09-29 18:20:33 -04:00
Richard Alam
6e6bdd908c - handle guest approval 2017-09-28 17:57:06 -07:00
Richard Alam
032562eab8 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-guest-policy 2017-09-28 16:58:03 -07:00
Richard Alam
e849e1b5ee - approve guest user 2017-09-28 16:56:33 -07:00
Richard Alam
c1a98bd3a5 - manage a pool of libre office instances so we can process multiple docs at the same time 2017-09-28 10:00:47 -07:00
Richard Alam
84cfda3459 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-guest-policy 2017-09-27 11:32:13 -07:00
Richard Alam
9d9df0eee0 - lower timeout timer for validation 
- change location of preschecker
 2017-09-26 14:07:51 -07:00
Richard Alam
67eb305552 - log pres checker command so we can try running on cmd line if it fails 2017-09-26 13:13:10 -07:00
Richard Alam
a124b2d0e8 - call presentation checker from bbb-web 2017-09-26 12:23:39 -07:00
Richard Alam
e062e42cd0 - implement redirect of client to guest waiting 2017-09-25 14:12:54 -07:00
Richard Alam
df255c154b - init guest status when joining 2017-09-22 14:53:37 -07:00
Richard Alam
4717a53182 - start implementing guest policy 2017-09-22 14:24:08 -07:00
Ghazi Triki
9b997392f0 Added new logoutTImer feature. 2017-09-21 20:12:59 +01:00
Anton Georgiev
32398bc40e Merge branch 'implement-group-chat' of github.com:ritzalam/bigbluebutton into pods_vol1 2017-09-19 11:41:52 -04:00
Anton Georgiev
871498dd0d Split POST upload request into two stages at nginx 
Subrequest goes to different endpoint on bbb-web to ensure
that the content length (passed in header) is taken under
consideration prior to uploading file
 2017-09-18 14:25:00 -04:00
Josh
7a3a5dbadc convert to string 2017-09-15 12:27:46 -04:00
Josh
1b08b26113 fix conflicts 2017-09-15 11:48:31 -04:00
Josh
ace8eac1cf no longer pretty print getRecordings response 2017-09-15 11:40:26 -04:00
Fred Dixon
59444dadc7 Merge pull request #4395 from joshua-arts/fix-playback-length-units 
Convert playback length to minutes when writing to XML.
 2017-09-13 16:39:45 -04:00
Josh
a25c9ba740 convert playback length to minutes when writing to xml 2017-09-13 15:34:37 -04:00
Richard Alam
136566d0d9 Merge branch 'fix-getRecordings-response' of https://github.com/joshua-arts/bigbluebutton into joshua-arts-fix-getRecordings-response 2017-09-13 08:55:59 -07:00
Josh
cc2a3f055a remove recording tag from getRecordings resp 2017-09-13 11:50:39 -04:00
Anton Georgiev
f8087e0af3 store, check, exprire upload authz tokens in bbb-web 2017-09-13 10:39:28 -04:00
Richard Alam
b662c1c722 - log exception so we can get info of broken metadata.xml file 2017-09-08 13:18:44 -07:00
Richard Alam
8173c7ef0e - escape text xml properly 2017-09-08 12:32:14 -07:00
Richard Alam
edc242f46b - fix format of playback 2017-09-05 07:58:44 -07:00
Richard Alam
ab232b54d7 - update recording metadata 
- publish/unpublish recording
 - delete recording
 2017-09-03 16:41:31 -07:00
Richard Alam
b14b04576d - publish/unpublish recording 
- get recordings
 2017-09-03 13:44:43 -07:00
Richard Alam
cdb39d469e - process get recordings api call 2017-09-03 10:52:18 -07:00
Richard Alam
bb740a6d72 - get metadata xml 2017-09-01 15:00:38 -07:00
Richard Alam
38a63427bd - start implement metadata xml reader 2017-09-01 10:34:01 -07:00
Richard Alam
e066c1713f - generate xml 2017-08-31 15:25:59 -07:00
Richard Alam
018c220986 - try using scala-xml library 2017-08-31 13:59:21 -07:00
Richard Alam
e8127fdb61 - do not include recordings with bad metadata.xml in the response for recording api calls 2017-08-31 08:06:15 -07:00
Richard Alam
63195ec5d2 - upgrade jodconverter lib to get PPT files converted to PDF working 2017-08-17 09:52:37 -07:00
Richard Alam
45160333e8 - log extra infor during doc conversion 2017-08-11 13:20:47 -07:00
Richard Alam
7956b561d2 - remove some printlns to minimize noise 2017-08-11 11:22:26 -07:00
Richard Alam
1a698058e1 - implement check to see if akka-apps is alive from bbb-web so we can return an 
error to API requests
 2017-08-08 12:16:00 -07:00
Richard Alam
5ecf0c3651 - hook up end meeting from api 2017-08-02 13:06:16 -07:00
Richard Alam
beb7155121 Merge branch 'recordings-size' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-recordings-size 2017-08-02 08:22:02 -07:00
Richard Alam
3b44d0eac2 - fix issue where late joiners displays the wrong slide 2017-08-01 14:50:44 -07:00
Pedro Beschorner Marin
ca36ec29d8 Included missing getters and setters for recordings size and raw size 2017-08-01 16:33:45 +00:00
Pedro Beschorner Marin
73443fe2db Clean up unused redis message service 2017-08-01 15:14:03 +00:00
Pedro Beschorner Marin
835f7d5371 Removed unused playbacks included with mconf merge 2017-08-01 15:11:49 +00:00
Richard Alam
47f012f08f - start fixing breakout rooms 2017-07-21 14:15:51 -07:00
Richard Alam
bf1031374a - pass timeout expire when last user leaves from bbb-web to akka-apps 2017-07-16 08:11:48 -07:00
Richard Alam
8994c7f644 Merge branch 'bbb-2x-mconf' into implement-meeting-expiry 2017-07-16 07:49:45 -07:00
Richard Alam
0f39d99ce5 - implement meeting expiry 2017-07-15 19:10:04 -07:00
Chad Pilkey
1bb72e6391 clean up pre-2.0 voice message code 2017-07-15 17:33:25 -04:00
Richard Alam
a0467f319c Merge branch 'bbb-2x-mconf' into work-on-meeting-lifcycle 2017-07-15 09:30:02 -07:00