1099 Commits

Author	SHA1	Message	Date
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
Richard Alam	5be0dec165	Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol4	2017-10-28 17:32:29 -07:00
Anton Georgiev	8dddd206c3	send presenter group to late joiner	2017-10-28 20:08:54 -04:00
Richard Alam	7885023e19	Merge branch 'implement-multi-chat' of github.com:ritzalam/bigbluebutton into antobinary-pods_vol4	2017-10-28 14:58:35 -07:00
Richard Alam	519da9033d	Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol4	2017-10-27 17:16:57 -07:00
Anton Georgiev	99f409f41e	cleanup	2017-10-27 19:28:22 -04:00
Anton Georgiev	d38a05105c	work on maintaining correct state (current presentation in pod)	2017-10-27 19:17:50 -04:00
Richard Alam	14691b2bf1	- change trigger for start/stop voice recording	2017-10-27 09:29:27 -07:00
Richard Alam	a7a8c2a0cc	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into implement-multi-chat	2017-10-27 08:03:25 -07:00
Richard Alam	84b12dfa94	Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0	2017-10-27 07:51:17 -07:00
Anton Georgiev	1efe354031	work on default pod race condition and controlling current pres	2017-10-26 17:54:21 -04:00
Richard Alam	51b9634bcd	- cahpterBreakLength config option	2017-10-26 14:14:00 -07:00
Richard Alam	c14a946041	- generate recording path in akka-apps for audio	2017-10-26 14:07:22 -07:00
Fred Dixon	4569e2d25e	Merge pull request #4575 from capilkey/fix-fit-to-width-extremes ... Relax presentation resize bounds to accommodate fit-to-width	2017-10-26 15:00:48 -04:00
Chad Pilkey	18a97923c6	relax presentation resize bounds to accomodate fit-to-width	2017-10-26 13:20:43 -04:00
Richard Alam	1fc7362b2b	- add user into user's list when auto-reconnected to bbb-apps	2017-10-25 14:58:09 -07:00
Richard Alam	852353a491	- stop, start voice recording when chapter break occurs	2017-10-25 11:18:27 -07:00
Richard Alam	8497b9049d	Merge branch 'master' into implement-multi-chat	2017-10-25 07:33:26 -07:00
Anton Georgiev	ff1aac2698	hardcode podId for first pod (for default.pdf)	2017-10-24 16:54:55 -04:00
Anton Georgiev	8e06408a33	set current presenter in pod	2017-10-24 15:49:57 -04:00
Richard Alam	1f99106ba1	- write chapter break done file to kick off processing	2017-10-23 13:31:07 -07:00
Anton Georgiev	31ce060896	added podId to SlideView to isolate events	2017-10-23 16:30:25 -04:00
Richard Alam	066ceea0f4	- generate record chapter break event	2017-10-23 12:16:26 -07:00
Richard Alam	6067b96db8	Merge branch 'master' into implement-multi-chat	2017-10-23 08:00:42 -07:00
Anton Georgiev	6f8abff77c	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pods_vol4	2017-10-21 08:50:25 -04:00
Anton Georgiev	325a6ef8f2	show presenter group in pod dropdown	2017-10-21 08:03:52 -04:00
Anton Georgiev	030567368a	add/remove user from presenter groups	2017-10-20 17:01:57 -04:00
Richard Alam	d832719d27	- clean up some unused code	2017-10-20 11:24:05 -07:00
Richard Alam	54bd2acf99	- fix tests	2017-10-20 10:49:36 -07:00
Richard Alam	afb217fe70	Merge branch 'remove-reconnect-handler' of https://github.com/ritzalam/bigbluebutton into ritzalam-remove-reconnect-handler	2017-10-20 08:11:49 -07:00
Richard Alam	ec35eed07c	Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton	2017-10-20 08:10:43 -07:00
Richard Alam	333dba585b	- remove for now as sometimes when reconnect occurs while there is only one user in the voice conference and ... the meeting is being records, the audio conference fails to record.	2017-10-20 07:38:50 -07:00
Richard Alam	cfec9de678	Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into update-with-20	2017-10-19 18:20:25 -07:00
Richard Alam	11f0bdf0ac	Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol4	2017-10-19 17:46:35 -07:00
Richard Alam	e01692c40b	- send voice conf started and destroyed message	2017-10-19 17:18:50 -07:00
Richard Alam	a3530cad91	- remove for now as sometimes when reconnect occurs while there is only one user in the voice conference and ... the meeting is being records, the audio conference fails to record.	2017-10-19 12:59:14 -07:00
Anton Georgiev	04cef71384	re-enable next/prev/goto slide	2017-10-19 14:47:59 -04:00
Richard Alam	a548af00f7	- format	2017-10-18 10:11:56 -07:00
Richard Alam	8070821068	Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into implement-multi-chat	2017-10-18 10:09:54 -07:00
Richard Alam	cbd82ffa29	- simplify sending of message	2017-10-18 10:07:54 -07:00
Anton Georgiev	56cdecf152	add presentation into state	2017-10-18 11:46:33 -04:00
Richard Alam	313440abdd	- send an eject message to the client so client doesn't attempt to auto-reconnect	2017-10-17 15:01:10 -07:00
Richard Alam	a5ddf0b203	- setup layered handler traits for rights management	2017-10-17 13:57:57 -07:00
Richard Alam	55e371fce2	- layer rights management traits	2017-10-17 12:37:22 -07:00
Richard Alam	4a48a69c7f	- start implementing rights management	2017-10-17 11:41:05 -07:00
Richard Alam	5c765072c4	- start implementing rights management	2017-10-16 14:32:05 -07:00
Richard Alam	11c7287d26	- don't force changing listen only status on mute and talking events	2017-10-12 15:36:19 -07:00
Richard Alam	73493f1345	- change how we handle listen only for html5 user	2017-10-12 15:33:22 -07:00
Richard Alam	680a538596	- do not set listenOnly status when receiving user joined voice event from FS as ... HTML5 client connects with no mic	2017-10-12 14:41:12 -07:00
Richard Alam	b87adb98fb	- fix passing of guest policy through create api	2017-10-03 14:45:32 -07:00
Richard Alam	2958095b32	- create private and public chats	2017-10-03 13:42:24 -07:00
Richard Alam	04ae60f6aa	- fix determining of guest status	2017-10-03 11:01:48 -07:00
Richard Alam	058751c3f2	Merge branch 'pods_vol3' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol3	2017-10-03 08:44:26 -07:00
Anton Georgiev	301003bc2d	cleanup	2017-10-03 11:43:16 -04:00
Richard Alam	ac599366be	- remove akka http prototype as redis scala is incompatible with the latest akka release	2017-10-03 08:36:18 -07: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	0866bc01ce	independent pods, visible slide on presenter side	2017-10-03 11:06:54 -04:00
Richard Alam	a3ad18347e	Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into implement-multi-chat	2017-10-02 18:28:02 -07:00
Richard Alam	8ae38b6f5a	- format	2017-10-02 18:01:33 -07:00
Richard Alam	fb72db4c8d	- open new public chat window	2017-10-02 11:04:11 -07:00
Ghazi Triki	ab93ae6c22	Fix send breakout room join url for late joiners.	2017-10-02 18:56:36 +01:00
Richard Alam	b71aaed133	- open multi chat windows	2017-10-02 08:30:20 -07:00
Richard Alam	398e6f7a02	- try opening windows	2017-10-01 17:29:44 -07:00
Anton Georgiev	60904989b3	work on set presentation (client + akka apps)	2017-10-01 09:50:12 -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	e849e1b5ee	- approve guest user	2017-09-28 16:56:33 -07:00
Richard Alam	fe44a79298	- send guest waiting message to client	2017-09-27 12:48:30 -07:00
Richard Alam	8e7670c81d	- handle guest policy	2017-09-27 11:16:14 -07:00
Anton Georgiev	6d4fa587c8	work on add and remove presentation pods	2017-09-25 14:58:11 -04:00
Richard Alam	4717a53182	- start implementing guest policy	2017-09-22 14:24:08 -07:00
Richard Alam	5c2e12f04f	- display chat history	2017-09-21 14:13:42 -07:00
Anton Georgiev	9283c342b7	add a default presentation pod on present module load	2017-09-21 15:30:39 -04:00
Anton Georgiev	9c92780ddb	added presentation pod models	2017-09-20 16:58:04 -04:00
Richard Alam	e651785a4e	- handle group chat created msg on client	2017-09-20 11:59:33 -07:00
Richard Alam	ff23e66220	- implement create group chat handler	2017-09-20 09:04:00 -07:00
Richard Alam	5800f3b752	Merge branch 'upload-token' of https://github.com/antobinary/bigbluebutton into antobinary-upload-token	2017-09-19 10:11:09 -07:00
Richard Alam	c8de303c5c	- add message	2017-09-19 10:11:02 -07:00
Anton Georgiev	3a9eb01bf2	missed calling the handlePresentationUploadTokenReqMsg method in merge	2017-09-19 12:06:49 -04: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
Richard Alam	fea62db871	- handle get chat history	2017-09-15 13:04:22 -07:00
Richard Alam	1fae5d6b96	- send and receive public chat message	2017-09-15 11:17:19 -07:00
Richard Alam	9b0f074d6e	- modify chat to use models	2017-09-13 13:35:46 -07:00
Richard Alam	a790143d37	- create publish group chat	2017-09-13 10:55:08 -07:00
Anton Georgiev	f8087e0af3	store, check, exprire upload authz tokens in bbb-web	2017-09-13 10:39:28 -04:00
Richard Alam	6decd24480	- implement group chat handlers	2017-09-12 14:47:33 -07:00
Anton Georgiev	bba8300fbf	require token to upload presentation	2017-09-12 16:25:41 -04:00
Richard Alam	3a203e9adb	- cleanup ... - try to break meassage	2017-09-12 12:25:10 -07:00
Richard Alam	4b20567d17	- refactor handlers	2017-09-09 06:59:12 -07:00
Richard Alam	9b5f652b1c	- try to extract logger	2017-09-08 12:25:45 -07:00
Richard Alam	8e610bbd22	- refactor handlers	2017-09-07 19:14:08 -07:00
Richard Alam	7f83fe3ea8	- modify polls	2017-09-07 18:00:32 -07:00
Richard Alam	c7c26f637b	- convert screenshare to not use traits	2017-09-07 15:04:50 -07:00
Richard Alam	2a3315f185	- remove parens	2017-09-07 14:50:30 -07:00
Richard Alam	9a5c11aceb	- remove traits from closed caption	2017-09-07 14:30:43 -07:00
Richard Alam	02289d0828	- do not use traits for handlers	2017-09-07 14:14:30 -07:00
Richard Alam	81acf00079	- change access type to string	2017-09-07 13:21:09 -07:00
Richard Alam	e0161b8da8	- implement group chat message handlers	2017-09-07 12:51:19 -07:00
Richard Alam	0886bc5caa	Merge branch 'bbb-2x-mconf' into implement-group-chat	2017-09-07 09:18:49 -07:00
Richard Alam	987e58e78c	- fix issue where audio isn't recording if there is already a user joined listen only before a user ... joins full duplex.	2017-09-07 09:11:11 -07:00
Richard Alam	659efaeff0	- start create group chat	2017-09-07 08:36:56 -07:00
Richard Alam	33aae4b505	- fix test compile	2017-09-06 18:39:38 -07:00
Richard Alam	6247079c07	- init state	2017-09-06 18:17:04 -07:00
Richard Alam	5b977fb57d	- add to state	2017-09-06 15:04:53 -07:00
Anton Georgiev	f6edf5d6fb	eject phone user from voice instead of kicking it	2017-09-06 17:55:44 -04:00
Richard Alam	00b2d9242e	- add tests	2017-09-06 14:29:30 -07:00
Richard Alam	c7686b3a90	- implement group chat	2017-09-06 12:58:36 -07:00
Richard Alam	a7056469fb	- implement models	2017-09-05 18:11:43 -07:00
Richard Alam	3a6690c335	- start implementing group chat	2017-09-05 17:08:40 -07:00
Chad Pilkey	523bfa0338	Merge pull request #4334 from ritzalam/rec-poll-result ... - fix recording of poll result. See issue #4237.	2017-09-05 14:18:08 -04:00
Pedro Beschorner Marin	4017d12fa1	Refactored shared notes cleaning to force sync	2017-09-01 19:36:15 +00:00
Chad Pilkey	a8ff311f91	Merge pull request #4342 from pedrobmarin/shared-notes-message-limit ... Shared notes message limit	2017-08-30 18:42:00 -04:00
Chad Pilkey	52bff50f10	clean dimension numbers from pencil end message	2017-08-30 17:14:00 -04:00
Pedro Beschorner Marin	6ab641e7c3	Added shared notes clear button for moderators	2017-08-30 20:32:42 +00:00
Richard Alam	82177b4d85	- fix recording of poll result. See issue #4237.	2017-08-30 11:01:19 -07:00
Chad Pilkey	b0e3442ef6	relax the pencil smoothing a little	2017-08-29 10:23:25 -04:00
Chad Pilkey	97da17d13b	send annotation updates based on timer	2017-08-23 17:55:03 -04:00
Chad Pilkey	c4f1e7b06f	Merge pull request #4269 from capilkey/remove-userid-capilization ... Remove userId capital in AssignPresenter recorded event	2017-08-18 14:09:53 -04:00
Chad Pilkey	50d617f622	remove userId capital in AssignPresenter recorded event	2017-08-18 14:07:38 -04:00
Richard Alam	6c1945551d	- fix rtt timer	2017-08-17 14:24:23 -07:00
Anton Georgiev	7cddb1b865	Merge pull request #4258 from antobinary/webcams ... Do not send broadcast cam event for existing stream	2017-08-17 12:21:11 -04:00
Richard Alam	458d23d0a2	- fix mute all and mute except presenter issue where all users cannot be muted then unmuted	2017-08-16 14:30:36 -07:00
Richard Alam	5e1297e8f8	- trigger sending of rtt from server side ... - send rtt of client to server so we can collect data	2017-08-16 14:05:22 -07:00
Anton Georgiev	192cd48810	do not send broadcast cam event for existing stream	2017-08-16 16:16:22 -04:00
Richard Alam	ec314b8105	- add round trip trace message from client and back to tell us where the bottleneck ... might be when using multi-user whiteboard.	2017-08-16 09:44:27 -07:00
Richard Alam	13b6dc065e	- fix issue where we cannot start breakout rooms again when the first breakout session ends.	2017-08-15 12:24:21 -07:00
Richard Alam	3879d48f17	Merge branch 'audio-state' of https://github.com/antobinary/bigbluebutton into antobinary-audio-state	2017-08-14 11:52:04 -07:00
Anton Georgiev	293c58ca42	distinguish fresh user join from reconnect. Recover audio state	2017-08-14 14:38:51 -04:00