1826 Commits

Author	SHA1	Message	Date
Gustavo Trott	fd4761374f	Improvements to set all endedOn/leftOn when meeting is ended	2021-08-04 16:25:22 -03:00
Gustavo Trott	8346f1d9cf	Avoid send activity message if it didnt have new activities	2021-08-02 11:50:11 -03:00
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
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	2500d4f767	Removes from Json all start/stop talks info, and inform only the totalTime	2021-07-23 14:02:48 -03:00
Gustavo Trott	eea16c8268	Remove unnecessary codes	2021-07-23 10:47:03 -03:00
Gustavo Trott	284b97840e	Remove unnecessary codes	2021-07-23 10:43:28 -03:00
Gustavo Trott	0661712da1	Removes Json content from INFO LOG. To avoid too large logs.	2021-07-23 10:40:57 -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
Gustavo Trott	21f90fc0e3	Handle anonymous Polls to hide the autor of the answer	2021-07-21 14:16:27 -03:00
Gustavo Trott	c1e39819fe	Fix: Stop last user Talk when Audio is disabled or muted	2021-07-20 17:39:36 -03:00
Anton Georgiev	064f525f68	Merge pull request #12646 from jfsiebel/wip-prevent-unasign-assign-spam ... WIP Prevent spam of assign presenter role	2021-07-20 16:02:52 -04:00
Joao Siebel	8462465a5f	Allow default layout config in bbb-web. close #12668	2021-07-19 11:02:58 -03:00
Gustavo Trott	d0b08f5603	Improvements in screenShare registers	2021-07-16 16:53:47 -03:00
Gustavo Trott	45d4c310c2	Merge branch 'develop' into activity-report	2021-07-13 11:12:45 -03:00
Gustavo Trott	974c8e1945	Adds Screenshare activities	2021-07-13 11:03:52 -03:00
Gustavo Trott	5c602fd2b0	Merge branch 'develop' into breakoutrooms-set-name	2021-07-12 16:31:38 -03:00
Anton Georgiev	b9cc633286	Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.3.5-into-develop	2021-07-06 19:36:19 +00:00
Gustavo Trott	0417cbb03f	Adds Activity Dashboard initial version and generate activityReportAccessToken	2021-06-30 00:01:46 -03:00
Joao Siebel	fc56678f71	Remove unused import	2021-06-28 10:43:10 -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
Joao Siebel	95e9cd3ef1	Add role check to allow webcamsOnlyForModerator changes. close #12636	2021-06-23 15:28:37 -03:00
Gustavo Trott	54dfe4bc3e	ActivityTracker handle/stores more important events	2021-06-23 11:51:10 -03:00
Joao Siebel	1d7bab7e0b	Prevent unnecessary call to unassign presenter and add logs	2021-06-22 14:44:34 -03:00
germanocaumo	349af23f0a	Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into anonymous-polls	2021-06-16 21:54:28 +00: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
germanocaumo	31138d440e	fix(poll): readd userId for non secret poll record event	2021-06-16 17:01:56 +00:00
Gustavo Trott	37dea2215b	Translates dynamically breakout room Names when default name is being used	2021-06-14 16:59:27 -03:00
Richard Alam	b6e49e5218	Merge branch 'develop' into paultrudel-analytics-actor-for-meeting-info	2021-06-12 01:29:28 +00:00
Richard Alam	ef766217f7	Merge branch 'analytics-actor-for-meeting-info' of https://github.com/paultrudel/bigbluebutton into paultrudel-analytics-actor-for-meeting-info	2021-06-12 01:28:37 +00:00
Anton Georgiev	1369cb2269	Merge pull request #12505 from gustavotrott/breakoutroom-inscrease-time ... Add 'Extend duration' option for breakout rooms	2021-06-11 16:33:15 -04:00
germanocaumo	7bedcb08e5	fix(poll): don't translate user/presenter typed answers ... When the answer is not default (Custom or UserResponse), don't translate the answers.	2021-06-11 16:55:53 +00:00
paultrudel	90fd6f4d2f	analytics endpoint now successfully returns meeting info	2021-06-11 09:31:51 -04:00
Gustavo Trott	c33f2f48ef	Add Actor to receive and store user activities	2021-06-09 10:00:18 -03:00
Gustavo Trott	5b579d3a16	Avoid extend breakout rooms time exceed parent meeting remaining time	2021-06-07 14:19:20 -03:00
tibroc	8f80f95251	removed userId and added secretPoll flag to RecordEvents	2021-06-07 11:01:34 +02:00
tibroc	1f329a70e3	pass secret polls also to handlers and object models	2021-06-07 10:57:53 +02:00
tibroc	828cf60cb2	Add option to hide individual answers in polls ... This patch adds a new option to hide the individual answers to the presenter when starting a poll. This includes hiding the answers for the presenter and informing the other users that the current poll is anonymous. See #9524	2021-06-07 10:56:14 +02:00
Gustavo Trott	02ef1186be	Avoid set negative values in Extend time for breakout rooms	2021-06-02 17:36:43 -03:00
Gustavo Trott	a312557461	Adds extend breakout room time functionality	2021-06-02 15:29:40 -03:00
Pedro Beschorner Marin	d4888f585c	refactor(external videos): state as integer ... A media state may have more than 2 states. Moving this property back to integer so it can be extended.	2021-06-02 15:07:03 -03:00
Pedro Beschorner Marin	4a5b92445a	refactor(external videos): system stop ... Move all external video's system stop control events to akka-apps: - on presenter change - on presenter leave - on screenshare start	2021-06-02 15:06:17 -03:00
Arthur B. Grossi	b0f2297809	refactor(external videos): add akka-apps model	2021-06-02 13:06:41 -03:00
Arthur B. Grossi	e606df6031	feat(external video): permission check ... Checks permission of start, stop and update external video messages and only broadcast it if the sender is presenter (unless it's system messages).	2021-06-02 12:54:37 -03:00
Anton Georgiev	93c9aecab8	Merge pull request #12447 from gustavotrott/fix-user-inactive-while-in-breakoutroom ... fix: Avoid users to be ejected due to inactivity while they are in a breakout room	2021-05-31 11:00:15 -04:00
Anton Georgiev	8868e84e9f	Merge pull request #12395 from gustavotrott/end-when-no-moderator ... Implements endWhenNoModerator	2021-05-31 10:59:55 -04:00
Anton Georgiev	9f84b993f7	Merge pull request #12467 from pedrobmarin/f-r-mow ... fix!(recording): moderator only webcams	2021-05-31 10:49:17 -04:00
Anton Georgiev	2b4746fc85	Merge pull request #12465 from pedrobmarin/f-r-rrce ... feat(recording): record role change event	2021-05-31 10:47:15 -04:00
Pedro Beschorner Marin	0e34d7239d	fix!(recording): moderator only webcams ... BREAKING CHANGE: fix typo at moderator only webcams recorded event.	2021-05-30 14:13:39 -03:00
Pedro Beschorner Marin	ed64e330ee	feat(recording): record role change event ... Reuse `ParticipantStatusChangeEvent` record event, already used by emojis and webcam streams, to record `UserRoleChangedEvtMsg`. Role change is stored at `events.xml` as: - promotion ``` <event timestamp="2068340" module="PARTICIPANT" eventname="ParticipantStatusChangeEvent"> <timestampUTC>1622384175759</timestampUTC> <date>2021-05-30T14:16:15.759Z</date> <status>role</status> <userId>w_fowyht7g0tfi</userId> <value>MODERATOR</value> </event> ``` - demotion ``` <event timestamp="2071437" module="PARTICIPANT" eventname="ParticipantStatusChangeEvent"> <timestampUTC>1622384178855</timestampUTC> <date>2021-05-30T14:16:18.855Z</date> <status>role</status> <userId>w_fowyht7g0tfi</userId> <value>VIEWER</value> </event> ```	2021-05-30 11:19:30 -03:00
germanocaumo	ed6e895b67	refactor: rename inside question parameters	2021-05-27 21:11:50 +00:00
germanocaumo	4d347be53b	refactor: use questionText instead of title for poll question	2021-05-27 21:04:15 +00:00
Gustavo Trott	b3f1d51f44	Updates user lastActivityTime in parent room while user is in breakout room	2021-05-26 17:16:15 -03:00
germanocaumo	674d23105e	fix: don't show empty line when poll have 7 answers	2021-05-20 18:39:33 +00:00
Gustavo Trott	979b21c0ed	Improve code reading	2021-05-17 18:13:00 -03:00
Gustavo Trott	00240c925e	Implements endWhenNoModerator	2021-05-17 17:52:59 -03:00
Anton Georgiev	1bc324b657	Merge pull request #12353 from germanocaumo/poll-record-improvs ... Recorded polling events improvements	2021-05-13 13:43:36 -04:00
germanocaumo	ca2ad30e12	fix(record): add missing info to polling events ... Add PollPublishedRecordEvent with all infos (also fix duplicated handlePollStoppedEvtMsg) Add answer text to UserRespondedToPollRecordEvent (useful for custom answers) Add type in PollStartedRecordEvent	2021-05-11 18:37:23 +00:00
germanocaumo	af6180a618	fix(record): add question title in pollstartedrecordevent	2021-05-11 18:36:42 +00:00
Gustavo Trott	62b24b8c19	Code improvements in inactivity warning funcs	2021-05-11 10:01:35 -03:00
Gustavo Trott	17994bb4dd	Fix problem that users was not being ejected after inactivity warning timeout	2021-05-10 15:12:13 -03:00
Michael Zinsmeister	5ca831ff86	Merged upstream develop branch	2021-05-01 16:59:20 +02:00
Richard Alam	22d434416a	- lump other responses in the poll and include in the display	2021-04-29 14:44:18 +00:00
Richard Alam	39c69675a4	- sort answers based on number of votes ... - limit display of responses to 7 to prevent squishing of display in the whiteboard	2021-04-28 21:34:21 +00:00
Richard Alam	414716d23b	- remote debug logs	2021-04-28 21:33:34 +00:00
Anton Georgiev	867edc695c	Merge pull request #12142 from ritzalam/do-not-log-chat-msgs ... Do not log chat msgs	2021-04-26 15:06:05 -04:00
Richard Alam	ebf883d087	- add flag to not log the chat messages	2021-04-24 02:23:17 +00:00
Richard Alam	19c66dac6c	- remove debug logs	2021-04-24 02:15:22 +00:00
Richard Alam	ba40af8324	- let parent meeting manage breakout lifecycle	2021-04-23 23:22:01 +00:00
Richard Alam	722fb707cc	- fix issue https://github.com/bigbluebutton/bigbluebutton/issues/11358 by having the parent meeting ... tell the breakout rooms the remaining time. Currently, each room has its own countdown timer which could introduce drifting resulting in breakout rooms ending at different times.	2021-04-23 21:25:06 +00:00
Richard Alam	b89fd1dbe2	- only update parent meeting if this is breakout room	2021-04-23 21:21:23 +00:00
Anton Georgiev	3ebb2cf46d	Merge pull request #12004 from prlanzarin/u23-isitcoldinthewater ... video: voice activity video sorting	2021-04-20 09:47:43 -04:00
hiroshisuga	4db28a2824	Fancy random viewer selection (#11297) ... * Revert "Delete bbb-icons-ori.woff" This reverts commit 84937a0d07. * Revert "Add files via upload" This reverts commit 391434445a. * Revert "Delete bbb-icons.woff" This reverts commit 7c245c666d. * Revert "Add files via upload" This reverts commit 6f8c764c4b. * Revert "Delete tmp.woff" This reverts commit 5141e65359. * Revert "Add files via upload" This reverts commit c8f7b17b04. * Revert "Create tmp.woff" This reverts commit 73c4506594. * Revert "Delete bbb-icons.woff" This reverts commit 9d01d58527. * Revert "Revert "Delete bbb-icons.woff"" This reverts commit d221d290cd. * Revert "Revert "Revert "Delete bbb-icons.woff""" This reverts commit c415ff02d1. * Revert "Revert "Delete bbb-icons.woff"" This reverts commit d221d290cd. * Revert "Revert "Create tmp.woff"" This reverts commit 267dc412d5. * Revert "Delete bbb-icons-ori.woff" This reverts commit 84937a0d07. * Revert "Delete bbb-icons.woff" This reverts commit 7c245c666d. * Revert "Add files via upload" This reverts commit 6f8c764c4b. * Revert "Add files via upload" This reverts commit c8f7b17b04. * Revert "Create tmp.woff" This reverts commit 73c4506594. * Revert "Delete bbb-icons.woff" This reverts commit 9d01d58527. * Revert "Revert "Delete bbb-icons.woff"" This reverts commit 64a48f2bd6. * Revert "Revert "Revert "Delete bbb-icons.woff""" This reverts commit 9d1b4a068a. * Revert "Revert "Revert "Revert "Delete bbb-icons.woff"""" This reverts commit b60491d933. * Revert "Revert "Revert "Revert "Revert "Delete bbb-icons.woff""""" This reverts commit 16e357091d. * Revert "Revert "Revert "Revert "Revert "Revert "Delete bbb-icons.woff"""""" This reverts commit e0b70f2055. * Revert "Revert "Revert "Revert "Revert "Revert "Revert "Delete bbb-icons.woff""""""" This reverts commit 7b1bde97ed. * Update UsersMgs.scala * Update selectRandomViewer.js * Update clearRandomlySelectedUser.js * Update addMeeting.js * Update updateRandomViewer.js * Update component.jsx * Update container.jsx * Update component.jsx * Update container.jsx * Update styles.scss * Update en.json * Update SelectRandomViewerReqMsgHdlr.scala * code simplification * in case only one person to be selected * Update en.json * Create en.json * Update en.json * Update component.jsx * Update styles.scss * Update en.json * Update updateRandomViewer.js Fix a typo * Update component.jsx When the presenter is moved to a viewer, in the modal of ex-presenter "somebody is selected" should be displayed. Before this modification, "somebody is the only viewer" was displayed. * add a comment explaining why a condition is needed. * Update en.json * Update en.json * revert (due to the rename UserMgs -> UserMsgs) * Update UsersMsgs.scala	2021-04-15 11:12:10 -04:00
prlanzarin	172e31b78e	Rework of the floor event ... Now it`s called AudioFloorChanged* to properly reflect its role Add fields to carry the floor state (boolean) along with the uID and vID to be able to send events for a floor takeover and a floor surrender	2021-04-12 18:25:58 +00: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
Aron Engineer	182340112a	feat: Meeting id query param added, support for get and getall added	2021-04-09 18:47:01 +00:00
Gustavo Trott	b7d61e45eb	Reorganize code	2021-04-08 16:53:22 -03:00
Gustavo Trott	3e675af3b5	Akka broadcasts UploadedFile Too Large error msg	2021-04-08 16:49:17 -03:00
Aron Engineer	e5903ccfdd	feat:Meeting analytics web api endpoint added to expose meeting info	2021-04-08 19:19:22 +00: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
Aron Engineer	d4ed29b49d	Merge branch 'develop' into analytics_actor_for_meeting_info	2021-04-06 12:52:36 +00:00
Aron Engineer	35909a4cba	fix: Null value replaced with other relevant placeholder values for analytics logging.	2021-04-05 20:55:55 +00:00
Aron Engineer	c7563765c6	fix: Analytics logging value Meeting Recorded corrected, common messages change	2021-04-05 18:43:39 +00: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
Aron Engineer	66b320c26a	fix: extra lines removed from updateWebcamStream	2021-04-01 18:12:36 +00:00
Aron Engineer	2d740ec2a9	feat: CamStreamSubscribeSysMsg added with handler and update webcam functionality, ScreenStreamSubscribeSysMsg added	2021-04-01 17:35:09 +00:00
Aron Engineer	1a2af980cf	fix: literal renamed for readability	2021-03-30 20:28:01 +00:00
Aron Engineer	21ad951f5f	feat: TwoWay user params added to MeetingAnalyticsInfo message, Message body modified with correct ref naming	2021-03-30 20:08:41 +00:00
Anton Georgiev	cf6491adc8	Merge branch 'develop' into multiple-choice-poll	2021-03-30 12:49:35 -04:00
Aron Engineer	7c06f3b85e	Merge branch 'develop' into analytics_actor_for_meeting_info	2021-03-29 19:50:03 +00:00
Aron Engineer	c3640f2971	fix:Banned user rejoining error code modified with error message	2021-03-29 17:22:55 +00:00
Anton Georgiev	aae72c0547	Merge branch 'develop' into multiple-choice-poll	2021-03-29 11:54:44 -04:00
Aron Engineer	7195a67e4e	fix: MeetingInfoAnalyticsMessage WebcamStream modified	2021-03-26 20:29:27 +00:00
Aron Engineer	4c328e980a	Merge branch 'develop' into analytics_actor_for_meeting_info	2021-03-24 20:32:22 +00:00
Aron Engineer	fe898bc276	WIP: Meeting actor modified to separate individual params	2021-03-24 20:30:01 +00:00
Aron Engineer	105e1d0166	fix: Option removed from ValidateAuthTokenRespMsg and respective handlers, default eject reason added	2021-03-24 17:42:19 +00:00
Aron Engineer	376dfcc59a	Merge branch 'develop' into logout_response_message_modified_reasoncode	2021-03-24 13:15:45 +00:00
Aron Engineer	52d57645c4	fix: ValidateAuthTokenRespMsg reason code added to the message.	2021-03-23 21:13:14 +00:00
Pedro Beschorner Marin	0c4cf0135d	Handle pad's events and Meteor's instances ... Since Meteor was split in multiple process and events started to be filtered by instances, all Etherpad's Redis events were being discarded. Etherpad has a Redis' publisher plugin that is unaware of BigBlueButton's existence. All the communication between them is kept simple with minimal of internal data exchange. The concept of distincts subscribers at Meteor's side broke part of this simplicity and, now, Etherpad has to know which instance must receive it's messages. To provide such information I decided to include Meteor's instance as part of the pad's id. Should look like: - [instanceId]padId for the shared notes - [instanceId]padId_cc_(locale) for the closed captions With those changes the pad id generation made at the recording scripts had to be re-done because there is no instance id available. Pad id is now recorded at akka-apps and queried while archiving the shared notes.	2021-03-23 18:03:50 -03:00
Aron Engineer	6d100d2a21	WIP: New params added to MeetingInfoAnalyticsLogMessage	2021-03-23 20:13:40 +00:00
Aron Engineer	f0b7aea734	Merge branch 'develop' into analytics_actor_for_meeting_info	2021-03-23 13:06:15 +00:00
Aron Engineer	f598862149	feat: Presenter added to presentationInfo analytics message	2021-03-19 19:25:08 +00:00
Aron Engineer	af528b26d1	feat: WIP meeting info analytics logging messages computed	2021-03-18 21:43:49 +00:00
Anton Georgiev	b1bbc3fd52	Merge branch 'develop' into multiple-choice-poll	2021-03-17 16:11:49 -04:00
Pedro Beschorner Marin	d90ba5e286	Merge branch '2.3-per-user-wb' into develop	2021-03-16 20:28:39 -03:00
Pedro Beschorner Marin	381c5cb15c	Isolated whiteboard access ... Modified the previous implementation of the whiteboard individual access to remove multiple Collections dependency on this feature. Multi-user whiteboard is now an array instead of a boolean value and most of the access control can be synchronized and handled by akka-apps.	2021-03-16 19:55:25 -03:00
Michael Z	4d3bda1306	Merge branch 'develop' into multiple-choice-poll	2021-03-16 18:38:48 +01:00
Aron Engineer	eb601eef3e	fix: create meeting message order precedes group chat message in akka-apps	2021-03-15 22:34:54 +00:00
Michael Zinsmeister	b99bd3be0c	Merged upstream develop branch	2021-03-14 22:17:19 +01:00
Anton Georgiev	9f841bd64b	Merge pull request #11622 from prlanzarin/u23-ilgiardino ... [screenshare] Rewrite SFU/Kurento screensharing bridge (+reconnections|audio sharing|QoL, was #11025)	2021-03-12 05:13:11 -05:00
prlanzarin	7eb91f9273	Merge branch 'u22-screenshare18102020' of https://github.com/prlanzarin/bigbluebutton-1 into u23-ilgiardino	2021-03-11 18:49:14 +00:00
Aron Engineer	625c4962a0	feat: ValidateAuthToken revoked when user is logged out, reason added to response message	2021-03-11 14:32:01 +00:00
Aron Engineer	56a2ff5df8	feat: User modified to add logged out attribute	2021-03-11 14:32:01 +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
Michael Zinsmeister	6ac09c25cf	change back application.conf	2021-03-07 15:32:52 +01:00
Michael Zinsmeister	81d5129084	Merge with upstream	2021-03-07 15:28:39 +01:00
Michael Zinsmeister	214b236701	Merge with upstream	2021-03-07 15:12:49 +01: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
Aron Engineer	2c8220a897	fix: HealthActor messages optimized for the timestamp value update	2021-03-05 18:31:31 +00:00
Aron Engineer	284ba1af97	fix: Timeout exception response modified with typesafety.	2021-03-05 17:23:51 +00: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
Aron Engineer	391ce4d83d	feat: BasicStatusCheck added for redis db, computation added to HeathActor	2021-03-02 20:49:02 +00:00
Anton Georgiev	abf9ed4063	Merge pull request #11538 from prlanzarin/u22-track1006022021 ... Improve permission checks for video, screen sharing and listen only	2021-03-02 15:46:33 -05: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
Anton Georgiev	879c54981e	Merge pull request #11447 from antobinary/external-video-sync-lucas-amguirado73 ... External video events propagated through akka-apps	2021-03-02 08:53:09 -05:00
Anton Georgiev	550bf6d282	Merge pull request #11525 from gustavotrott/develop ... Adds lastAuthTokenValidatedOn to users	2021-03-01 13:56:16 -05:00
Anton Georgiev	d20479d7c4	Merge pull request #11493 from aron-2809/bbb-core-http-endpoint-wip ... WIP: Http endpoint added for health check	2021-02-26 12:44:04 -05:00
Pedro Beschorner Marin	540ce10c24	Recording external video events	2021-02-26 00:59:40 +00:00
Anton Georgiev	aff272cbf3	Merge #7484 into #11447 ExternalVideo recording events	2021-02-25 19:54:22 +00:00
Gustavo Trott	63e00bd7ca	Adds lastAuthTokenValidatedOn to users in Akka, send it in ValidateAuthTokenRespMsg pubSub msg, makes Meteor store it as authTokenValidatedTime	2021-02-25 16:52:20 -03:00
Aron Engineer	135f80ba71	WIP: Http endpoint added for health check	2021-02-24 21:23:07 +00:00
Anton Georgiev	af7e158244	Set falllback value of voiceConf.ejectRogueVoiceUsers to true	2021-02-24 13:12:02 -05:00
Anton Georgiev	b8eaf47263	Merge pull request #11454 from schrd/akka-config ... Akka config	2021-02-23 08:44:00 -05:00
Anton Georgiev	0b6496618c	Merge branch 'develop' of github.com:amguirado73/bigbluebutton into external-video-sync-lucas	2021-02-21 11:04:39 +00:00
Daniel Schreiber	5d620e7acd	let bbb-apps-akka read an override config file from /etc/bigbluebutton ... This change introduces a config file `/etc/bigbluebutton/bbb-apps-akka.conf` which reads the default config from packages and allows operators to keep their own config file changes across package upgrades. This removes the workaround of copying the config file to /tmp in preinst and then extracvting API URI and secret and then in postinst inject it back to the config file in /usr/share If the config file in /usr does not have the "changeme" secret, then API URI and secret are extracted and injected to the generated file /etc, so packages would upgrade in a clean way. The postrm script removes the config file in /etc if the package is purged but not if it is just uninstalled. bbb-install and bbb-conf must reflect this change and replace the API secret and URL in /etc, not /usr/share	2021-02-19 13:55:36 +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	e966d6c7b6	Merge pull request #11366 from MaximKhlobystov/updating-poll-ui ... Updated poll UI: question field and typed responses	2021-02-18 10:32:33 -05:00
Anton Georgiev	49cdf9faef	Merge pull request #11413 from gustavotrott/develop ... Include registeredOn date in pubSub user creation messages to replace loginTime creation in Meteor	2021-02-17 16:56:53 -05:00
Gustavo Trott	573bfc107b	Remove changes not related to issue	2021-02-17 09:39:36 -03:00
Gustavo Trott	91f4eba678	Replace registeredOn params to Long (timestamp) instead of String (ISO_OFFSET_DATE_TIME)	2021-02-17 09:20:55 -03:00
prlanzarin	866c771792	akka-apps: make ejectRogueVoiceUsers true by default	2021-02-17 08:54:47 -03:00
Anton Georgiev	b2c4244276	Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into 2.3-alpha5-with-split-meteor-roles-10349	2021-02-16 19:55:10 +00:00
Gustavo Trott	129a4e4f33	Remove changes not related with registeredOn issue	2021-02-16 15:40:56 -03:00
Gustavo Trott	12e363eb92	Removes loginTime creation from Meteor and use the registeredOn date created on Akka. Makes Akka send the registeredOn date throught PubSub messages: UserRegisteredRespMsg, GuestsWaitingForApprovalEvtMsg and ValidateAuthTokenRespMsg.	2021-02-16 14:46:30 -03:00
Anton Georgiev	f43560d535	Support for backend vs frontend nodejs instances bbb-html5	2021-02-16 03:19:31 +00:00
prlanzarin	8f233b74ee	akka-apps: handle dial-in users in voice user ejection	2021-02-12 17:16:32 -03:00
Richard Alam	04a05f0bbe	Merge pull request #11390 from aron-2809/fix-userId-EndMeeting ... fix inserts userId to the EndMeeting function calls.	2021-02-12 14:58:52 -05:00
prlanzarin	703505c486	akka-apps: extend SysConf in VoiceApp ... To be used with the ejectRogueVoiceUsers config option	2021-02-12 16:01:44 -03:00
Pedro Beschorner Marin	ba9528ebb1	Option to eject voice users with no matching user ... Reconnects may introduce ghost voice users in a meeting when the client fails to rejoin but the audio connection remains active. While fetching for the voice conference user's status, apps can now check if a voice user has a matching user record. If it doesn't, eject the voice user.	2021-02-12 15:29:56 -03:00
Aron Engineer	1d8c51e9cf	fix inserts userId to the EndMeeting function calls.	2021-02-12 17:45:08 +00:00
prlanzarin	1290838b16	akka-apps: cleanup on the camera/listen/screen permission calls	2021-02-11 19:45:59 -03:00
Richard Alam	71eb8cc664	Merge pull request #11383 from aron-2809/fix-issue-11182 ... User role is incorrect after client reconnect.	2021-02-11 14:53:55 -05:00
Aron Engineer	a49789d50a	User role is incorrect after client reconnect. ... fix for issue: https://github.com/bigbluebutton/bigbluebutton/issues/11182	2021-02-11 18:57:58 +00:00
Anton Georgiev	2061e0ddd2	Merge pull request #11164 from BrentBaccala/preserve-bbb-web-settings ... preserve bbbWebAPI and sharedSecret over upgrades	2021-02-11 12:50:42 -05:00
Fred Dixon	54ae154759	Merge pull request #11380 from schrd/akka-systemd ... Customize systemd unit files	2021-02-11 07:36:19 -04:00
Daniel Schreiber	b6777ed9cb	Customize Systemd unit files ... Currently there is a mechanism in bbb-config which adds overlay units. This is not neccesary because sbt allows you to specify your own unit files.	2021-02-11 11:16:55 +01:00
prlanzarin	765686714b	akka-apps, video: add camera broadcast and subscribe permission check messages ... Used by bbb-webrtc-sfu to enrich its validation on whether a user is allowed to broadcast or subscribe to a camera stream	2021-02-10 21:55:46 -03:00
prlanzarin	93aa556aba	akka-apps, screenshare: add broadcast and subscribe permission check messages ... Used by bbb-webrtc-sfu to enrich its validation on whether a user is allowed to broadcast a screen or subscribe to one	2021-02-10 19:02:19 -03:00
prlanzarin	c226d9544e	akka-apps: add global audio permission check messages ... Used by bbb-webrtc-sfu to enrich its validation on whether a user is allowed to subscribe to the global audio bridge via listen only or not	2021-02-10 15:00:04 -03: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
Michael Zinsmeister	129681c0d5	Merge remote-tracking branch 'origin/multiple-choice-poll' into multiple-choice-poll	2021-02-09 14:40:50 +01:00
Michael Zinsmeister	f5831d7da7	Revert "backend mutiple choice - config files" ... This reverts commit 7a6c534f	2021-02-09 14:38:49 +01:00
Maxim Khlobystov	480602a1a6	Using ArrayBuffer instead of Array when creating a new Question	2021-02-09 06:24:23 +00:00
Anton Georgiev	e2e0b78d40	Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into split-meteor-roles-on-top-of-2.3-alpha6	2021-02-08 23:39:42 +00:00
Maxim Khlobystov	ff4260dc98	Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into updating-poll-ui	2021-02-08 21:41:43 +00:00
Simon Hirtreiter	70fc71cc70	Merge remote-tracking branch 'upstream/develop' into multiple-choice-poll ... # Conflicts: # bbb-common-message/src/main/scala/org/bigbluebutton/common2/domain/Meeting2x.scala	2021-02-08 17:00:36 +01:00
Michael Zinsmeister	eaa6f0260c	Fix poll results and add locale entries	2021-02-08 10:57:39 +01: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	8c0f0fdd52	Split Meteor roles backend-frontend revisit	2021-02-05 17:47:46 +00:00
hiroshisuga	0d63383c2a	Prevent presenter being selected by random viewer selection (#11275) ... Akka-apps filter presenter and moderators from random viewer selection list	2021-02-04 20:26:04 -05:00
Michael Zinsmeister	7a6c534fef	backend mutiple choice - config files	2021-02-04 16:13:21 +01:00
Michael Zinsmeister	462f963d08	backend mutiple choice	2021-02-04 16:13:07 +01: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
werk21	80af96ff76	9101: Survey: New profile yes/no/abstention	2021-01-24 02:22:40 +01:00
Pedro Beschorner Marin	19cbef1fd9	When authenticatedGuests is disabled, guests should be fit for promotion	2021-01-23 21:51:03 -03:00
Pedro Beschorner Marin	0bbef12ac7	Authenticated guests feature controlled at bbb-web properties	2021-01-23 21:48:02 -03:00
Anton Georgiev	45c1ff6e40	Merge pull request #11175 from MaximKhlobystov/select-random-user ... Presenter selecting a random viewer	2021-01-22 15:31:00 -05:00
Brent Baccala	434b64ed88	packaging for bbb-web: preserve bbbWebAPI and sharedSecret over upgrades ... Trying to get to the point where upgrades can occur without having to re-run bbb-conf	2021-01-15 16:35:50 -05:00
hiroshisuga	7f5352e2f9	Update application.conf	2020-12-17 23:13:32 +09:00
Anton Georgiev	8b65f9e15b	Set bbb-html5 loadbalancing to be round robin	2020-12-15 01:55:57 +00:00
Anton Georgiev	9239d515a5	dispatch whiteboard events to html5 redis channel only	2020-12-12 01:45:38 +00:00
Anton Georgiev	09ca742e01	cleanup	2020-12-11 23:46:01 +00:00
Anton Georgiev	0be8773e4c	Loadbalance bbb-html5 in bbb-web based on CPU	2020-12-11 21:36:06 +00:00
germanocaumo	83fe68db08	Play screenshare audio when present	2020-12-08 20:30:22 +00:00
Anton Georgiev	3faabd1821	Merge 2.2.29 and 2.2.30 into 2.3.x	2020-11-24 15:13:09 +00:00
KDSBrowne	50f85ff2e2	make responders private | add accessors	2020-11-05 19:24:10 +00:00
KDSBrowne	2f46c1fd28	Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-user-rand-select	2020-11-02 16:16:29 +00:00
KDSBrowne	d2cb02b3bd	prevent users from being able to send more than 1 poll vote	2020-10-28 18:33:09 +00:00
Anton Georgiev	df8b6350c9	Merge pull request #10617 from KDSBrowne/2.3-undo-pencil ... Fix broken undo of consecutive pencil annotations	2020-10-27 14:59:57 -04:00
KDSBrowne	73f890c9d8	Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-updated-polling	2020-10-21 16:05:03 +00: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
KDSBrowne	d74b5af2a9	clear selected user when moderator closes modal | clean up	2020-10-19 14:46:41 +00:00
KDSBrowne	c518263fc9	fix broken undo of consecutive pencil annotations	2020-10-08 14:35:36 +00:00
hiroshisuga	ff47857c18	Update Bezier.java	2020-09-30 22:44:26 +09:00
hiroshisuga	a7c981d124	Update Bezier.java	2020-09-30 09:59:11 +09:00
hiroshisuga	e857d016e0	Update Bezier.java	2020-09-30 09:49:08 +09:00
KDSBrowne	3e8eebdd1b	move random viewer selection to akka-apps	2020-09-25 19:41:30 +00:00
Pedro Beschorner Marin	a7e1623619	Option to prevent eject users by permission violation ... PermissionCheck verifies ejectOnViolation before eject an user	2020-09-22 15:13:15 -03:00
KDSBrowne	d32155cc5f	add new poll type | allow typed responses | update UI	2020-09-21 12:07:36 +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
Anton Georgiev	14f464087f	Merge pull request #8417 from pedrobmarin/backend-cleanup ... Backend cleanup	2020-08-28 15:37:00 -04:00
root	851c2645ea	Committer: Antonio Guirado <amguirado73@gmail.com> ... Changes to be committed: new file: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/ExternalVideoApp2x.scala new file: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/StartExternalVideoPubMsgHdlr.scala new file: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/StopExternalVideoPubMsgHdlr.scala new file: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/UpdateExternalVideoPubMsgHdlr.scala modified: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala modified: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala modified: akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala new file: bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/ExternalVideoMsgs.scala new file: bigbluebutton-html5/imports/api/external-videos/server/eventHandlers.js new file: bigbluebutton-html5/imports/api/external-videos/server/handlers/startExternalVideo.js new file: bigbluebutton-html5/imports/api/external-videos/server/handlers/stopExternalVideo.js new file: bigbluebutton-html5/imports/api/external-videos/server/handlers/updateExternalVideo.js modified: bigbluebutton-html5/imports/api/external-videos/server/index.js modified: bigbluebutton-html5/imports/api/external-videos/server/methods.js modified: bigbluebutton-html5/imports/api/external-videos/server/methods/emitExternalVideoEvent.js modified: bigbluebutton-html5/imports/api/external-videos/server/methods/startWatchingExternalVideo.js modified: bigbluebutton-html5/imports/api/external-videos/server/methods/stopWatchingExternalVideo.js new file: bigbluebutton-html5/imports/api/external-videos/server/streamer.js modified: bigbluebutton-html5/imports/api/meetings/server/handlers/meetingDestruction.js modified: bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeeting.js modified: bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js modified: bigbluebutton-html5/imports/api/users/server/handlers/validateAuthToken.js modified: bigbluebutton-html5/imports/api/users/server/store/bannedUsers.js modified: bigbluebutton-html5/imports/startup/server/index.js modified: bigbluebutton-html5/imports/startup/server/redis.js modified: bigbluebutton-html5/imports/ui/components/external-video-player/service.js modified: bigbluebutton-html5/private/config/settings.yml	2020-08-28 12:58:55 +02:00
KDSBrowne	0fdd1dc978	allow start / stop of polls with no presentation	2020-07-20 14:34:46 +00:00
Anton Georgiev	3b843e7c56	Do not ban user who left while in waiting list. Adjusting after merging 2.2. into 2.3 in #9672	2020-05-26 13:55:38 +00: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	b6194f96cb	Add log in akka-apps to show whether user was banned or simply ejected	2020-05-22 11:12:19 -04:00
Anton Georgiev	e7917994d5	add banUser field in EjectUserFromMeetingCmdMsgBody	2020-05-22 10:45:28 -04:00
Richard Alam	eb006d470b	Ejected users due to permission check cannot rejoin meeting ... - users who are ejected from meeting because of permission check cannot rejoin meeting as we mark them as banned. Only users ejected by a moderator should be banned. Later on, we should make the moderator indicate if the ejected user should be bannd or not. see https://github.com/bigbluebutton/bigbluebutton/issues/9608	2020-05-19 12:41:35 -07:00
basisbit	5ccba7b0fb	akka-bbb-apps only listen on localhost ... attack surface reduction by having akka-bbb-apps only listen on localhost	2020-05-15 13:42:20 +02:00
Anton Georgiev	c3e1738314	Adjust #8499 for 58fed45754 ... Tweaking `RegisteredUsers.remove(u.id, liveMeeting.registeredUsers)` since we no longer have .remove on RegisteredUsers	2020-05-06 16:27:47 +00:00
Anton Georgiev	cc79c4b6ae	merge 2.2.10 into 2.3	2020-05-05 19:52:44 +00:00
Richard Alam	292f673f5e	Do not send disconnect message ... Do not send disconnect message when validate token fails as meteor will disconnect the client itself.	2020-04-28 19:29:21 -07:00
Richard Alam	309ac30899	- comment out debug printlns	2020-04-24 07:20:42 -07:00
Richard Alam	58fed45754	Do not ban users ejecting self from meeting ... Some users join with multiple browsers. When user is ejecting self from one browser, do not eject all sessions for that user and do not prevent them from rejoining.	2020-04-24 07:14:50 -07:00
Richard Alam	cca49e4546	Keep track of banned dial-in callers ... When a dial-in caller is ejected from the meeting, keep track of the callerid number. When the same callerid number rejoins the conference, eject the caller.	2020-04-23 19:12:16 -07:00
Richard Alam	c40f1727d3	Prevent ejected users from rejoining ... - track ejected user based on external userid. If user rejoins with the same external userid, fail the validate token.	2020-04-21 19:26:09 -07:00
Chad Pilkey	40b18b0662	whiteboard performance improvements	2020-04-08 20:03:56 +00:00
Anton Georgiev	1299abdf2c	Revert "Merge pull request #8782 from ritzalam/generate-meeting-data" ... This reverts commit 37ed2c7501, reversing changes made to 5af41dabb4.	2020-03-25 16:13:01 -04:00
Richard Alam	3cddd8a1c5	- dump out some meeting stats data into the log	2020-03-14 11:54:45 -07: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	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
Richard Alam	d879710503	- minimize logs	2020-02-28 13:12:53 -08:00
Ghazi Triki	64d08d69c7	Updated java projects dependencies versions.	2020-02-28 10:44:28 +01: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	2fbd2821f4	- fix to display slodes	2020-02-20 12:43:23 -08:00
Richard Alam	7099df132d	- handle new messages in akka apps	2020-02-19 15:04:19 -08:00
Richard Alam	db4dc4aff0	- add urls on presentation page conversion message	2020-02-18 14:03:08 -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
Richard Alam	7911d2b874	- client session wasn't set properly	2020-02-06 07:36:42 -08:00
Richard Alam	5af6374265	Track call session state ... Currently, we user DTMF to inform the client when the call session is in echo test and when entering the voice conference. Unfortunately, sometimes when FS sends the DTMF, FS crashes. Monitor the progress of the call session using ESL events and propagate to the client. The client would be informed of these call states: CALL_STARTED, IN_ECHO_TEST, IN_CONFERENCE, CALL_ENDED.	2020-02-05 14:58:47 -08:00
Pedro Beschorner Marin	397041efcc	Removes waiting guests that stop polling for their status	2020-01-15 12:03:52 -03:00
Anton Georgiev	866f359b0e	Add handling route for GetRunningMeetingsReqMsg	2020-01-09 15:59:48 +00:00
Pedro Beschorner Marin	13060aef26	Moving CheckRunningAndRecordingVoiceConfEvtMsg outside the messages that affect inactivity handler	2019-12-12 17:46:11 -03:00
Pedro Beschorner Marin	690d34029d	Remove Flash shared notes backend	2019-12-11 17:40:56 -03:00
Pedro Beschorner Marin	b11113c165	Remove meeting inactivity monitor	2019-12-11 17:11:57 -03:00
Anton Georgiev	56b1b12431	Merge branch 'master' into v2.2.x-release	2019-12-10 11:07:23 -05:00
Richard Alam	ecc99fa415	- apply lock settings when user is locked.	2019-12-06 14:31:50 -08:00
Richard Alam	e40def72a4	- enforce only mic settings when disabling mic	2019-12-06 13:46:02 -08:00
Richard Alam	bf2f4c536d	- apply lock settings to viewers and non-listen only users	2019-12-06 13:11:45 -08:00
Richard Alam	a26d1f0a8f	- enforce lock settings ... - make sure listen only users are muted	2019-12-06 11:50:50 -08:00
Richard Alam	124924735a	- if muted user is talking, mute the user	2019-12-06 11:37:20 -08:00
Richard Alam	27d9879c12	- check if listen only user is talking and mute if so	2019-12-06 11:24:38 -08:00
Richard Alam	bcc14792ea	- enforce lock settings when user joins voice conf ... - make sure liten only user is muted when they join voice conf	2019-12-06 11:11:48 -08:00
Richard Alam	ace413b319	- apply disableMic lock settings to viewers and listen only users	2019-12-06 10:33:04 -08:00
Richard Alam	5d7dbee1a6	- return all meeting id of running meetings and allow requesting state for each meeting.	2019-12-03 08:14:51 -08:00
Richard Alam	1f74bd8cf4	- send reply to get meeting request when there are no meeting running	2019-12-03 07:17:51 -08:00
Richard Alam	1f2448c1ea	Merge pull request #8256 from ritzalam/change-audio-recording-codec ... Change audio recording codec	2019-11-05 16:18:55 -05:00
Richard Alam	613a214817	Default recording codec ... Set the default recording codec to opus since we now have opus support in freeswitch.	2019-11-05 16:18:19 -05:00
Richard Alam	4c6bdebd00	Merge pull request #8225 from riadvice/big-pdf-conversion ... Detect big PDF files and check the page size	2019-10-29 16:47:26 -04:00
Richard Alam	0b81cb055b	- add flac codec	2019-10-29 08:44:33 -07:00
Richard Alam	bea53ac633	Allow configure of audio recording codec ... - set audio recording codec to ogg so file size will be smaller compared to wav	2019-10-25 13:13:41 -07:00
Richard Alam	6f29c5307f	- set different interval in sending recording and user status audio to freeswitch	2019-10-25 11:26:27 -07:00
Richard Alam	4f62e0ea79	- update last status in one spot	2019-10-24 15:28:16 -07:00
Richard Alam	5d52c15456	- handle voice user status event from FreeSWITCH	2019-10-24 13:36:28 -07:00
Richard Alam	7752808f47	- keep track of last user status update	2019-10-23 14:19:51 -07:00
Richard Alam	0261a5e2b8	- send users and recordings in one message	2019-10-21 14:29:52 -07:00
Richard Alam	1e7557562f	Sync FS user status ... - poll FreeSWITCH for status of user so that akka-apps would be in sync with FreeSWITCH	2019-10-21 11:01:58 -07:00
Ghazi Triki	cd944d4770	Add missing PdfConversionInvalidErrorEvtMsg event to be sent to the web client.	2019-10-21 13:33:40 +01:00
Richard Alam	3395cdbdc0	Make sure we record audio if meeting is recorded ... - We had an issue where FreeSWITCH, for some unknow reason, stopped recording the voice conference in the middle of the meeting while there are users in the voice conference. We've relied on the voice conf started event to trigger recording of wav files. This event is sent when the first user joins the voice conference. In this case, there was no voice user joined after the recording stopped as there were already users in the voice conference. TO make sure that the audio is recorded, akka-apps will send a "check if voice conf is running and recording" message to FreeSWITCH every 30sec. If akka-apps receives a "running=true recording=false" response from FreeSWITCH, akka-apps will send a start recording msg to FreeSWITCH.	2019-10-17 11:50:12 -07:00
Ghazi Triki	ba109530ae	Disallow converting PDF files that have at least one big weighted page.	2019-10-16 08:37:03 +01:00
Richard Alam	13d610f798	Stop recording of voice ... - stop recording of voice conference when meeting ends.	2019-10-01 11:34:41 -07:00
Chad Pilkey	027c28c320	add lock setting option to hide viewers from each other	2019-08-09 16:45:26 -07:00
Richard Alam	db88be858b	- fix https://github.com/bigbluebutton/bigbluebutton/issues/7452	2019-05-16 13:55:52 -07: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
Pedro Beschorner Marin	c27f409def	Locking shared notes from akka-apps up to the Flash client	2019-05-08 20:36:36 +00: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
Richard Alam	47ea1bed67	Merge pull request #7270 from pedrobmarin/unmute-users ... Unmute users	2019-05-01 10:52:12 -04:00
Richard Alam	bf7898225b	- minor cleanup	2019-04-30 12:30:59 -07:00
Richard Alam	0bd6b214d8	- add redis password to red5 apps	2019-04-29 09:04:16 -07:00
Pedro Beschorner Marin	324681d5b2	Renamed unmuteUsers to allowModsToUnmuteUsers	2019-04-23 12:30:55 -03:00
Richard Alam	1a39ecdc64	Merge branch 'master' into add-redis-password-on-master	2019-04-23 07:36:55 -07:00
Pedro Beschorner Marin	50afb24653	Changed from unmute only viewers to unmute anyone	2019-04-17 10:55:01 -03:00
Richard Alam	7fb5dc6e37	Do not trigger chapter break recording when meeting is set not to be recorded ... When chapterBreakLengthInMinutes > 0 in /usr/share/bbb-apps-akka/conf/application.conf, the chapter break is triggered even when the meeting isn't set to be recorded. Check if meeting is to be recorded before triggering chapter break.	2019-04-16 07:27:18 -07: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
Richard Alam	e98c5b0f26	- log whiteboard shape that has null values ... - sanitized pool results	2019-04-11 15:28:20 -07:00
Richard Alam	dcbeee3d17	- remove null values from whiteboard shapes	2019-04-11 12:57:47 -07: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
Pedro Beschorner Marin	3ac5204141	Filtering only Flash moderators	2019-04-05 14:47:43 +00:00
Pedro Beschorner Marin	9ae8813f47	Sending an extra message for guest management in Meteor	2019-04-05 13:18:24 +00:00
Richard Alam	a33271bc09	- make akka-apps and bbb-web work with redis password	2019-04-04 14:38:53 -07:00
Richard Alam	3aeaf72719	- flag that an authed user joined the meeting	2019-03-28 12:47:52 -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	3f7199c307	- enable scariform for akka-apps	2019-03-27 13:41:16 -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
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
Fred Dixon	4770ef7144	Merge pull request #6929 from fcecagno/disable-chapter-break ... Disable chapter break by default	2019-03-20 10:21:31 -04:00
Richard Alam	1e26e8ce29	Merge branch 'track-user-register-join' of https://github.com/ritzalam/bigbluebutton into ritzalam-track-user-register-join	2019-03-16 09:32:55 -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
Chad Pilkey	9cfc792eaf	allow unlocked viewers to unmute when meeting is locked	2019-03-13 10:28:43 -07:00
Felipe Cecagno	9ce5c45ee2	fix typo	2019-03-13 12:14:49 -03:00
Ghazi Triki	5a60f62b41	Copy dial number from the parent room to all breakout rooms.	2019-03-11 22:33:34 +01:00
Felipe Cecagno	f67808e9ae	set also default recordingChapterBreakLength to zero on SystemConfiguration	2019-03-07 13:49:11 -03:00
Felipe Cecagno	db2bfbe1dd	disable chapter break by default	2019-03-07 11:53:44 -03:00
Anton Georgiev	c7647a7254	Merge pull request #6862 from capilkey/2.2-fix-inactivity ... Fixed mapping of inactivity values	2019-03-05 16:43:26 -05:00
Richard Alam	9ecdff3d81	- track if user joins within a certain period of time. Sometimes, nodejs takes ... most of the CPU that users takes a long time to load the client and join. This way, we can detect if there are a number of users failing to join the meeting.	2019-02-26 20:27:52 -08:00
Chad Pilkey	5a6d067e98	fix private chat for viewers and allow pc with mod	2019-02-25 16:19:41 -08:00
Chad Pilkey	9a07f0abd2	fixed mapping of inactivity values	2019-02-25 12:48:46 -08:00
Anton Georgiev	38b743b895	Merge pull request #6711 from jfsiebel/sync-lock-settings-status ... Sync meeting lock settings status	2019-02-11 17:34:44 -05: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
Joao Siebel	555ee1232a	sync meeting lock settings status and handle GetLockSettingsRespMsg message. close #6669	2019-02-04 14:07:20 -02: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	0bad0747be	Update scala, sbt and akka version to the latest.	2018-12-16 20:18:37 +01:00
Ghazi Triki	78f5b2715d	Improve akka-bbb-fsesl packaging.	2018-12-14 15:15:19 +01:00
Ghazi Triki	b3ce26f753	Use the packaged logback configuration.	2018-12-13 22:55:45 +01:00
Ghazi Triki	dde9419ca4	Make akka-bbb-apps runnable for developers while keeping the packaging intact.	2018-12-13 22:29:05 +01:00
Pedro Beschorner Marin	dec1fe481d	Not overriding record prop	2018-12-13 11:46:20 -02:00
Richard Alam	71da5e6cac	Merge pull request #6383 from ritzalam/try-to-fix-akka-logging ... - minimize logging of redis connection	2018-12-11 17:08:35 -05:00
Richard Alam	3f9dc6655a	- minimize logging of redis connection	2018-12-11 14:06:09 -08:00
Richard Alam	2f383512c8	Merge pull request #6382 from ritzalam/try-to-fix-akka-logging ... Try to fix akka logging	2018-12-11 16:47:16 -05:00
Richard Alam	9a612f7e3d	- see if akka-apps package will start logging.	2018-12-11 13:33:07 -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
Ghazi Triki	4a5a1c572c	Fix logback dependency fro akka-bbb-apps.	2018-12-11 15:36:42 +01:00
Ghazi Triki	9569704254	Exclude red5 dependencies from akka and web projects.	2018-12-10 20:32:08 +01:00
Ghazi Triki	575c77d991	Minor edits to build.sbt	2018-12-10 19:18:32 +01:00
Ghazi Triki	5a9f74c88d	Fix akka applications packaging configuration.	2018-12-10 19:10:46 +01: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	79d34c42d2	Fix redis storage issues.	2018-12-06 11:53:39 +01:00
Ghazi Triki	fd959f9e14	Remove rediscala library and replace it by a lettuce implementation.	2018-12-05 20:21:06 +01:00
Ghazi Triki	5b8a9a0ace	Add password to redis scala classes.	2018-11-23 11:38:28 -02:00
Ghazi Triki	2614ba2cd0	Update deployment configuration.	2018-11-22 12:54:40 -02:00
Richard Alam	ff3f8239c8	- end the meeting asap when the last user leaves by setting meetingExpireWhenLastUserLeftInMinutes=0 in ... bbb-web's bigbluebutton.properties	2018-11-16 10:36:10 -08:00
Ghazi Triki	8e10280614	Fix configuration for akka and bbb-web projects.	2018-11-14 20:18:12 +01:00
Richard Alam	d1dad75898	Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-v20-master-nov14	2018-11-14 08:47:21 -08:00
Richard Alam	ddc391b3d9	- fix issue where meeting doesn't end when lasr user leaves or when meetign is never joined. ... - the client to server rtt message is always updating the meeting activity. This prevents the meeting from ending due to inactivity.	2018-11-13 13:01:16 -08:00
Ghazi Triki	fc4028d6de	Redis refactoring : remove duplicate classes, factorisation and build configuration update.	2018-11-09 20:19:46 +01:00
Ghazi Triki	0614ccd763	Updated akka-bbb-apps project to use sbt 1.2.6 and scala 2.12.7	2018-11-08 14:53:00 +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	92a2cd0d60	- delay removing user from user's list in case the user is just reconnecting	2018-10-24 12:42:00 -07:00
Richard Alam	eafa3273c5	- flag the user first when receiving user left event in case user is just reconnecting	2018-10-24 07:41:39 -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
Richard Alam	cdaf447758	Merge pull request #5975 from riadvice/user-typing-feature ... Implementation of user typing feature to chat	2018-09-12 13:43:43 -04:00
Richard Alam	5b03e0ef6c	Merge pull request #5581 from riadvice/recording-timer ... Add a new message RecordStatusResetSysMsg to be handled and saved in events.xml	2018-09-12 12:03:09 -04: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	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
Chad Pilkey	a8938c4605	add config option in akka-apps for default multi-user whiteboard state	2018-08-24 12:50:55 -07:00
Joao Siebel	11a139a2b8	add new SyncGetVoiceUsersRespMsg message in akka	2018-08-14 09:41:21 -03:00
Ghazi Triki	7d64eb69f9	Added user typing feature to chat.	2018-08-13 17:48:48 +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	a57f389f4a	- fix tracking of user inactivity	2018-07-30 10:53:29 -07:00
Richard Alam	804d1e2cc6	- change the log to be specific on what the method does.	2018-07-30 09:34:32 -07:00
Ghazi Triki	dffeeb8daf	Update user last activity time when he sends a message.	2018-07-30 11:43:19 +01:00
Ghazi Triki	ffb6d6e593	Update last user activity depending on his actions.	2018-07-27 19:00:15 +01:00
Ghazi Triki	7da3fb3c37	Fix inactive user check rule using time.	2018-07-27 17:48:39 +01: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
Richard Alam	b2c2705223	- send only recording timer updates to clients when the meeting is recording	2018-07-20 08:20:41 -07:00
Anton Georgiev	c1a739a883	Merge pull request #5298 from OZhurbenko/akka-create-default-pods-groupchats ... Added missing messages for presentation pods and group chats	2018-07-04 14:28:16 -04: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	445d16f27c	Merge branch 'implement-meeting-inactivity-timer' of https://github.com/ritzalam/bigbluebutton into ritzalam-implement-meeting-inactivity-timer	2018-06-28 10:32:46 -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
Richard Alam	0356721627	- clean up printlns	2018-06-27 12:58:49 -07:00
Richard Alam	db80060968	- fix reason ended string	2018-06-27 12:57:36 -07: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	80ea665049	- send meeting inactivity warning to client	2018-06-21 14:32:41 -07:00
Richard Alam	dc62b89691	Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch	2018-06-08 17:49:13 -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
Anton Georgiev	eb7a49f142	renamed noRedirect* to redirectToHtml5*	2018-06-07 15:59:06 +00:00
Anton Georgiev	a77ee38741	make breakout url for html5 and use it	2018-06-07 15:59:06 +00: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
Chad Pilkey	f7a5f675b6	add a table showing individual votes in the PollResultsModal	2018-06-01 16:06:49 -07:00
Anton Georgiev	658b9d81b3	Merge pull request #5512 from lfzawacki/use-get-recording-status ... Use GetRecordingStatus message to start recordings from the bbb-webrtc-sfu side	2018-05-28 13:55:30 -04:00
Ghazi Triki	8b85628549	Add a new message RecordStatusResetSysMsg to be handled and saved in events.xml	2018-05-23 21:14:34 +01:00
Richard Alam	6323289cbb	- no need to log	2018-05-23 11:08:11 -07:00
Richard Alam	69528a0d43	Merge branch 'breakout-room-server-expiry' of https://github.com/riadvice/bigbluebutton into riadvice-breakout-room-server-expiry	2018-05-23 10:39:39 -07:00
Richard Alam	4eb86bfb52	- format	2018-05-23 10:32:51 -07:00
Richard Alam	39558cd805	Merge branch 'recording-timer' of https://github.com/riadvice/bigbluebutton into riadvice-recording-timer	2018-05-23 10:11:09 -07:00
Ghazi Triki	eab45f7fa5	Fix event name typo.	2018-05-23 17:26:05 +01:00
Richard Alam	46a00dc82f	- fix issue where meeting ends when only or last user auto-reconnects	2018-05-23 08:09:51 -07:00
Ghazi Triki	4eebdf00fa	Add a new message RecordAndClearPreviousMarkersCmd.	2018-05-23 16:09:15 +01:00
Ghazi Triki	a4fef6ff8a	Fix server recording timer and correctly save MettingState2x	2018-05-22 18:07:06 +01:00
Richard Alam	ef60beec7c	- update the state to keep recording timer updated	2018-05-18 11:35:30 -07:00
Ghazi Triki	634635c8cd	Update recording confirmation window and add recording timer (Work In Progress)	2018-05-18 15:58:08 +01:00
Richard Alam	b352ee2c95	- change log timestamp format so they are all the same	2018-05-15 10:50:40 -07:00
Ghazi Triki	48b695697e	Make breakout rooms expire only by their duration.	2018-05-11 16:50:12 +01:00
Richard Alam	0614fd7916	- wait for the video stream stopped message from red5 to tell us that the stream is gone instead of guessing that ... the stream stopped because usef has left the meeting.	2018-05-11 08:49:44 -07:00
Richard Alam	14b35c8784	- add video stream events to logging so we can trace it	2018-05-11 08:49:06 -07:00
Richard Alam	aa3b3c9589	- remove extra logging	2018-05-11 08:48:42 -07:00
Lucas Fialho Zawacki	2d222b7b2e	Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into use-get-recording-status	2018-05-09 19:02:31 +00:00
Lucas Fialho Zawacki	9149d0c597	Add recorded parameter to GetRecordingStatusRespMsg	2018-05-09 17:53:45 +00: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	a3d1e18a77	- format	2018-04-24 15:04:52 -07:00
Chad Pilkey	04eefb40f2	Merge pull request #5329 from ritzalam/mobile-inactivity-timer ... User inactivity timer	2018-04-11 11:46:27 -04:00
Oleksandr Zhurbenko	2e0b9f9798	Combined traits for group chats and group chat messages	2018-04-09 20:59:03 -07:00
Richard Alam	5e10d6bd22	- handle user inacitivty message	2018-04-09 14:33:09 -07:00
Richard Alam	b85a361f3e	- init properly last inactivity audit response to handle late users	2018-04-09 14:02:00 -07:00
Richard Alam	48de7625c9	- user inactivity audit message sending and receiving	2018-04-09 12:22:00 -07:00
Richard Alam	837453454e	- user inactivity timer configuration	2018-04-09 12:20:21 -07:00
Chad Pilkey	880c5dc48e	Merge pull request #5314 from ritzalam/mobile-lock-settings ... Mobile lock settings	2018-04-09 13:44:59 -04:00
Richard Alam	39284f1d18	- start implementing user inactivity timer	2018-04-06 14:52:21 -07:00
Richard Alam	4baec2c7df	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into mobile-lock-settings	2018-04-04 13:17:51 -07:00
Richard Alam	5c92632032	- prevent flash client from being ejected when mobile client joins first	2018-04-04 08:55:27 -07:00
Oleksandr Zhurbenko	eef2d65d93	Sync message for the group chats and group chat messages	2018-04-01 20:10:28 -07:00
Oleksandr Zhurbenko	9141ae51fd	Added a message for when a default group chat is being created	2018-03-27 15:09:26 -07:00
Oleksandr Zhurbenko	32041e7a86	Added a message for when a default presentation pod is created	2018-03-26 16:24:51 -07:00
Richard Alam	efaf450472	- allow promoting of non-guest viewers to moderator role	2018-03-23 12:34:50 -07:00
Anton Georgiev	3fec097faa	send presentation pods through redis on html5 server start	2018-02-16 15:00:53 -05: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
Richard Alam	09cf94cb8a	- simplify check	2018-02-07 13:57:22 -08:00
Richard Alam	c67cb19dd4	- exclude pencil draw update and end status from being dropped by rights management so that pencil lines will smooth out	2018-02-07 13:39:24 -08:00
Richard Alam	8a1a1fc3ce	- clean up formatting	2018-02-07 12:34:39 -08:00
Richard Alam	d2fd54e6e9	- drop whiteboard and cursor messages instead of enforcing rights management	2018-02-07 11:31:36 -08:00
Richard Alam	47147056c4	- handle properly out of order recording started/stopped events from freeswitch	2018-02-07 07:30:33 -08:00
Richard Alam	2fa91e3308	- silence log	2018-02-05 17:30:51 -08:00
Richard Alam	1354b065be	Merge branch 'require-auth-token-on-red5-connect' of github.com:ritzalam/bigbluebutton into merge-20-with-master	2018-01-29 12:36:41 -08:00
Richard Alam	e3c54fc27c	- fix merge exceptions	2018-01-23 09:01:14 -08: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	aef4030750	- authorize connection using token	2018-01-22 14:05:48 -08:00
Richard Alam	672d3b5ef7	- try to prevent connecting to bbb-video with authz	2018-01-22 11:54:57 -08:00
Ghazi Triki	d6294c84a4	Fix function name typo.	2018-01-20 16:36:54 +01:00
Richard Alam	d4a5b91bc4	Merge pull request #4940 from capilkey/update-air-2.1 ... Update AIR for 2.1	2018-01-10 14:06:20 -08:00
Chad Pilkey	2717ef39da	removed unneeded properties from chat messages	2018-01-10 15:06:43 -05:00
Richard Alam	a5f80187e6	- when the client is ejected and it attempts to reconnect, the validate token should fail.	2018-01-09 12:31:50 -08:00
Ghazi Triki	9cad3facc3	Set webcamsOnlyForModerator in MeetingActor when the meeting is creator.	2018-01-09 20:47:03 +01:00
Richard Alam	e9b4cb817d	- change presenter of default presentation pod when presenter has changed	2018-01-08 12:13:20 -08:00
Richard Alam	1a2a2826ec	- do not kick new presenter out because of permission check	2018-01-08 11:23:21 -08:00
Ghazi Triki	d1c765e614	Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into webcams-only-for-moderator-on-off	2018-01-08 19:33:23 +01:00
Richard Alam	b93a95ca8e	Merge pull request #4896 from prlanzarin/flash-webcam-fix ... Ghost flash webcams fix	2018-01-08 10:18:52 -08:00
Ghazi Triki	36f02e8528	Request webcamsOnlyForModerator value at user enter success.	2018-01-07 22:24:54 +01:00
Ghazi Triki	38ab186b53	Change webcamsOnlyForModerator property and handle saving it in server and client.	2018-01-07 16:45:24 +01:00
Richard Alam	fb7a38eb52	- remove presenter group	2018-01-05 12:59:40 -08:00
prlanzarin	3f8e7c308c	Revert "Added checking for HTML5 webcams" ... This reverts commit 51b62ed30d.	2017-12-22 18:30:40 +00:00
Anton Georgiev	61c12298e2	Merge pull request #4661 from prlanzarin/bbb-webrtc-sfu ... Add support for WebRTC screensharing into Flash/HTML5 and WebRTC video into HTML5	2017-12-22 14:43:38 -02: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
prlanzarin	51b62ed30d	Added checking for HTML5 webcams ... This should prevent blank webcams on the flash client	2017-12-21 17:38:39 +00:00
Richard Alam	64a9cbfea1	- users come in as always unmuted, so no need to check muted flag	2017-12-20 13:30:35 -08:00
Ghazi Triki	276e9e2f5f	Fix put meeting and at muted status.	2017-12-20 17:32:10 +01:00
Chad Pilkey	911c2b84fe	Merge pull request #4845 from capilkey/fix-presentationpod-reconnect ... Change presentation pod reconnect to get all pods	2017-12-18 20:30:54 -05:00
Chad Pilkey	5bb13dedbf	change presentation pod reconnect to get all pods	2017-12-18 17:07:08 -05:00
Richard Alam	fd9906844f	- auto join user on reconnect	2017-12-15 19:17:08 -08:00
Richard Alam	72fd493c23	- add reason on why client is disconnected	2017-12-15 19:16:37 -08:00
Richard Alam	f5b9dfd644	Merge pull request #4837 from capilkey/2.1-checkpresenter-podmsghandlers ... Add a check for currentPresenter in pod message handlers	2017-12-15 19:55:22 -05:00
Richard Alam	058fff1e00	Merge branch '2.1-checkpresenter-podmsghandlers' of https://github.com/capilkey/bigbluebutton into capilkey-2.1-checkpresenter-podmsghandlers	2017-12-15 16:50:34 -08:00
Chad Pilkey	32375f1c66	add check for currentPresenter in pod message handlers	2017-12-15 19:47:06 -05:00
Richard Alam	31a80be511	- handle presentation download change in client	2017-12-15 08:50:59 -08:00
Ghazi Triki	89814bd613	Implement new feature: set presentation downloadable on and off. Work in progress.	2017-12-15 16:08:56 +01:00
Richard Alam	6a66a9fe01	- add create breakout rooms request to whitelist ... - use current presentation and page of main presentation window as default presentation for breakout rooms	2017-12-13 12:15:18 -08:00
Richard Alam	e0d0971070	Merge branch '2.1-whiteboard-improvements' of https://github.com/capilkey/bigbluebutton into capilkey-2.1-whiteboard-improvements	2017-12-13 10:16:43 -08:00
Chad Pilkey	1587b7560c	remove SyncWhiteboardAccess from one more place	2017-12-13 12:14:04 -05:00
Chad Pilkey	1551dcae15	move multiuser to be per-whiteboard	2017-12-13 02:14:43 -05: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	fe41b7eaa9	Merge pull request #4797 from ritzalam/use-sha256hex ... Use sha256hex	2017-12-11 17:12:28 -05:00
Richard Alam	e1a7946640	Merge pull request #4790 from ritzalam/promote-demote-user ... - promote to moderator only authenticated users	2017-12-11 17:11:57 -05:00
Richard Alam	7f51071f9e	- display specific eject reason to user	2017-12-11 14:03:14 -08: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	dda21b4a5e	Merge pull request #4793 from capilkey/disabled-moderator-unmute ... Fix meeting mute and disable unmute of others	2017-12-11 11:00:41 -05:00
Chad Pilkey	860fd2a5df	fix meeting mute and disable unmute of others	2017-12-11 00:00:32 -05:00
Richard Alam	b35e750f86	- promote to moderator only authenticated users	2017-12-09 19:10:14 -08:00
Richard Alam	2574a18e7f	Merge branch 'synch-with-v2.0' into guest-and-authenticated-guest	2017-12-08 12:04:56 -08:00
Richard Alam	b74a57aaaf	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into guest-and-authenticated-guest	2017-12-08 11:32:46 -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
Richard Alam	2acff2ce45	Merge branch 'check-guest-status' of https://github.com/ritzalam/bigbluebutton into ritzalam-check-guest-status	2017-12-08 08:30:33 -08:00
Richard Alam	68e452df6c	- add guest and authenticated info in client so we can display them separately	2017-12-07 10:47:07 -08:00
Chad Pilkey	4ce4204536	added poll record events, removed unused HidePoll message	2017-12-07 07:58:42 -08:00
Richard Alam	f5e6cc4046	- use header userId to validate token	2017-12-06 18:15:28 -08:00
Richard Alam	5a45dce81b	Merge pull request #4775 from ritzalam/check-guest-status ... - check guest status when validating auth token	2017-12-06 21:14:44 -05:00
Richard Alam	7c4435b0bb	- check guest status when validating auth token	2017-12-06 17:50:53 -08:00
Chad Pilkey	0159dd39dc	block slider change event handling when not presenter	2017-12-06 19:09:08 -05:00
Richard Alam	93f5dec98c	- remove duplicate message entry	2017-12-05 17:14:22 -08:00
Chad Pilkey	dd498ebf3a	correct build warnings in akka-apps	2017-12-04 22:23:06 -05: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
Richard Alam	ab2b1a6a35	- do allow mute/unmute self when lock settings is applied	2017-12-01 13:43:23 -08:00
Richard Alam	7b80d678dd	- remove user from presenter list when removed from presenter group	2017-11-30 15:14:42 -08:00
Richard Alam	0f23891649	- set no presenter to a pod if presenter group is empty	2017-11-30 13:24:19 -08:00
Richard Alam	fdf075e7df	- look for all pods where the user was the presenter	2017-11-30 13:10:37 -08:00
Richard Alam	0a2610ab18	- when a presenter on a pod leaves, assigne another presenter into that pod	2017-11-30 12:58:02 -08:00
Chad Pilkey	01efd0dbf4	stop viewers from opening new public chat pods	2017-11-24 19:04:31 -05:00
Richard Alam	99367b171b	- handle delayed messages in cases where lock settings are being changed	2017-11-23 08:16:34 -08:00
Richard Alam	b1b04939bd	- add comment on why we filter delayed messages after switching presenter	2017-11-22 14:14:22 -08:00
Richard Alam	3a29ecdc49	- filter delayed presentation messages after swithching presenter	2017-11-22 14:10:33 -08:00
Richard Alam	ace9fdd2b7	- handle delayed wb messages when switching from multi-user to single-user	2017-11-22 13:35:57 -08:00
Richard Alam	e3fc2b7088	- add the current presenter into the old presenter list when switching presenters	2017-11-21 15:07:54 -08:00
Richard Alam	e6b9946ba7	- do not eject old presenter messages in cases where delayed messages arrive in akka-apps	2017-11-21 14:42:33 -08:00
Richard Alam	764bc5a00c	Merge branch 'fix-private-chat-issues' of https://github.com/ritzalam/bigbluebutton into ritzalam-fix-private-chat-issues	2017-11-20 08:51:50 -08:00
Richard Alam	e13a68377c	Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0	2017-11-20 08:42:46 -08:00
Richard Alam	1466636d17	Merge branch '2.1-presentation-cleanup' of https://github.com/capilkey/bigbluebutton into capilkey-2.1-presentation-cleanup	2017-11-20 07:24:21 -08:00
Chad Pilkey	3235f8423c	clean up of akka-app presentpod code (removed ownerId and other redundant date)	2017-11-19 14:34:19 -05:00
Richard Alam	1623e5b05e	- retrieve private chat for user if reconnected	2017-11-17 11:37:41 -08:00
Richard Alam	6ff5d0db42	- pass mute param on message so we don't rely on toggling mute/unmute state for users	2017-11-17 08:46:18 -08:00
Richard Alam	9329e9316b	- determine guest status properly for moderators	2017-11-15 12:39:06 -08:00
Richard Alam	13d8711c53	Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0	2017-11-15 07:35:52 -08:00
Fred Dixon	4e59904455	Merge pull request #4672 from antobinary/add-multi-login-html5-flash ... Do not send UserLeftVoice on UserLeave - fix for audio state issue on reconnect	2017-11-15 08:36:32 -05:00
Anton Georgiev	a892d9fdd8	do not send UserLeftVoice on UserLeave --fix for audio state issue on reconnect	2017-11-14 17:36:08 -05:00
Anton Georgiev	16e7f5867b	I missed a line when resolving the conflict	2017-11-14 12:16:29 -05:00
Anton Georgiev	2276522c2e	Merge branch 'master' into remove-user-when-user-leaves	2017-11-14 14:57:19 -02:00
Richard Alam	420b6a9a14	- provide a way to skip whitelist filter in bbb-apps ... - tell akka-apps to eject user for client that violates whitelist - when validate token fails, disconnect client.	2017-11-13 14:25:31 -08:00
Richard Alam	f22cab9ac7	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into fix-chat-issues	2017-11-13 08:54:19 -08:00
Richard Alam	b2aae3ab3c	- clear public chat (incomplete) ... TODO: client doesn't clear yet	2017-11-13 05:56:14 -08:00
Chad Pilkey	82ea62a7ac	Merge pull request #4653 from capilkey/2.1-update-record-events ... Modify presentation, chat, and cursor record events to match 2.1 specs	2017-11-09 19:20:53 -05:00
Chad Pilkey	627a4e332e	modify presentation, chat, and cursor record events to match 2.1 specs	2017-11-09 19:03:55 -05:00
Chad Pilkey	46e0253f17	Merge remote-tracking branch 'upstream/master' into implement-rights-management	2017-11-09 14:36:25 -05:00
Anton Georgiev	84df0dfdd4	Merge pull request #4646 from ritzalam/fix-chat-issues ... Fix chat issues	2017-11-09 13:46:31 -02:00
Chad Pilkey	d1ebaa249b	Merge remote-tracking branch 'upstream/master' into implement-rights-management	2017-11-08 19:47:50 -05:00
Chad Pilkey	9f9cef6088	add rights-management for creating chat groups and sending messages	2017-11-08 19:24:53 -05:00
Chad Pilkey	bd20efea20	finished rights-management checks (minus chat)	2017-11-08 18:48:25 -05:00
Richard Alam	60d030d436	- track chat box closing	2017-11-07 04:31:01 -08:00
Chad Pilkey	0b7ee4d694	improvements to the page move events	2017-11-06 16:36:20 -05:00
Richard Alam	42b96e370d	- propagate guest policy change to bbb-web	2017-11-05 20:21:42 -08:00
Richard Alam	fb5723af1e	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into fix-chat-issues	2017-11-05 15:46:06 -08:00
Richard Alam	8e350724f4	- cleanup	2017-11-03 14:58:00 -07:00
Anton Georgiev	3ed0fc2a55	cleanup	2017-11-03 16:22:26 -04:00
Anton Georgiev	411307af3f	handle zoom and move event in presentation pods	2017-11-03 15:35:59 -04:00
Anton Georgiev	9451b774aa	move presentation conversion handling under presentatio pods	2017-11-03 14:27:10 -04:00
Anton Georgiev	57bd43f8a8	move presentation upload token to presentationPods	2017-11-03 13:55:44 -04:00
Richard Alam	3698c08315	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into fix-chat-issues	2017-11-03 10:11:10 -07:00
Anton Georgiev	4b3dd41c13	adjust permission level formation for presenter group	2017-11-03 11:59:15 -04:00
Anton Georgiev	ed725e1a97	remove user from presenter group on user leave	2017-11-03 11:43:06 -04:00
Richard Alam	4a5e4d4238	- cleanup	2017-11-03 08:38:49 -07:00
Anton Georgiev	a3d91b9ddb	adjust permissions for RemovePresentationPodPubMsg	2017-11-03 10:57:46 -04:00
Anton Georgiev	6ce6b73e6a	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pods_vol4	2017-11-03 10:08:10 -04:00
Anton Georgiev	5e5abc871d	adapt Polls in akka-apps to work with the default presentation pod only	2017-11-02 18:08:42 -04:00
Richard Alam	1c5c387456	- add all moderators to presenter group	2017-11-02 14:08:38 -07:00
Anton Georgiev	f1d3f31f3f	reuse DEFAULT_PRESENTATION_POD as a const	2017-11-02 16:54:42 -04:00
Richard Alam	4d44f09c84	- add permissions check on a few messages	2017-11-02 13:16:44 -07:00
Richard Alam	c2d0406d4c	- Check auth token when connecting to bbb-video. Close connection if not authorized.	2017-11-02 10:33:28 -07:00
Richard Alam	06e974847e	- send validate conn token	2017-11-01 19:54:24 -07:00
Richard Alam	4e8f2abbb3	- pass token on video connect	2017-11-01 14:55:48 -07:00
Richard Alam	f9b4209d74	- make chapter break length configurable	2017-11-01 12:23:03 -07:00
Anton Georgiev	9818fca29e	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pods_vol4	2017-11-01 09:56:58 -04:00
Anton Georgiev	28f1809a70	independent control of presenter for modules Present and Whiteboard	2017-10-31 18:49:25 -04:00
Anton Georgiev	8450921362	separate cursor events depending on whiteboardId (pod)	2017-10-31 15:55:59 -04:00
Chad Pilkey	a51274c7ad	add security check for ChangeUserEmoji	2017-10-31 13:07:53 -04:00
Chad Pilkey	3b91a87658	change two security checks to header userId from body	2017-10-31 13:06:00 -04:00
Chad Pilkey	7e47a08f29	allow users to mute themselves again	2017-10-31 13:05:07 -04:00
Chad Pilkey	ebcf7dc4cc	added some of the rights management checks	2017-10-30 23:21:02 -04:00
Richard Alam	b128ba3fea	Merge pull request #4593 from antobinary/pods_vol4 ... Improvements to Presentation Pods	2017-10-29 16:11:00 -04:00
Anton Georgiev	ebdaedd3ae	work on remove presentation from pod. WIP	2017-10-29 13:12:27 -04:00
Anton Georgiev	d888af2583	cleanup; moved assignments after constructor	2017-10-29 11:53:16 -04:00