BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,974 Commits 13 Branches 260 Tags 1.1 GiB
5cd379910f
Commit Graph

1746 Commits

Author SHA1 Message Date
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
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
Chad Pilkey
ac030e6254 fix meeting and client locking 2017-08-11 20:53:09 -04:00
Richard Alam
bc6f4f6638 - log switch presentation 
- fix switch presentation
 2017-08-11 13:19:56 -07:00
Richard Alam
965977cf80 - go through all presentations instead of just getting the active presentation 2017-08-11 13:19:05 -07:00
Anton Georgiev
412c1f95a2 refactor join audio user handler so it can be reused 2017-08-11 15:56:03 -04:00
Anton Georgiev
ec3166dc4a pass correct value for voiceUserId 2017-08-11 15:51:11 -04:00
Richard Alam
7956b561d2 - remove some printlns to minimize noise 2017-08-11 11:22:26 -07:00
Richard Alam
53b64fcca0 Merge branch 'end-breakout-rooms' of https://github.com/ritzalam/bigbluebutton into ritzalam-end-breakout-rooms 2017-08-10 13:58:02 -07:00
Richard Alam
7f63490e63 - end breakout rooms when parent meeting ends 
- send breakout ended event
 - do not send negative time remaining updates
 2017-08-10 13:29:33 -07:00
Anton Georgiev
1e492dba73 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into fix-webcam-state 2017-08-10 15:31:29 -04:00
Richard Alam
d50041f03c - send messages into separate channels so other components can pick and choose which 
channels to listen to.
 2017-08-10 10:14:50 -07:00
Anton Georgiev
0546afce1f only allow presenter to change slide 2017-08-10 10:59:03 -04:00
Pedro Beschorner Marin
185f6a85e9 Missing code for the promote/demote users feature 2017-08-09 20:13:52 +00:00
Richard Alam
131c67def3 Merge branch 'fix-webcam-state' of https://github.com/antobinary/bigbluebutton into antobinary-fix-webcam-state 2017-08-08 14:41:51 -07:00
Anton Georgiev
97b3c2fec9 Merge branch 'fix-webcam-state' of github.com:antobinary/bigbluebutton into fix-webcam-state 2017-08-08 15:57:43 -04:00
Anton Georgiev
6b4c9ea8a4 drop camera for leaving user 2017-08-08 15:22:21 -04:00
Richard Alam
1a698058e1 - implement check to see if akka-apps is alive from bbb-web so we can return an 
error to API requests
 2017-08-08 12:16:00 -07:00
Richard Alam
05054e4875 - need to notify parent meeting of user join and leave to get listen in to work 2017-08-04 09:32:52 -07:00
Richard Alam
f82e4f9d45 Merge pull request #4203 from ritzalam/fix-breakout-listen-mode 
breakout listen mode
 2017-08-03 23:20:13 -04:00
Richard Alam
279d3797ef - not transfer works but user isn't removed from users list in breakout room 2017-08-03 15:16:29 -07:00
Chad Pilkey
8db84cdf3f improvements to the recorded shape events 2017-08-03 15:41:40 -04:00
Richard Alam
a4243ac87a - auto-assign presenter when presenter is ejected from meeting 2017-08-03 10:50:58 -07:00
Richard Alam
dfef819823 - fix issue where if there is no presenter, we cannot assign a presenter. 2017-08-03 10:50:17 -07:00
Chad Pilkey
34fa2f22b2 Merge pull request #4195 from capilkey/record-extra-share-presentation 
Record extra SharePresentationEvent when conversion complete and current
 2017-08-02 17:30:30 -04:00
Chad Pilkey
4d16c73bde record extra SharePresentationEvent when conversion complete and current 2017-08-02 17:26:02 -04:00
Richard Alam
5ecf0c3651 - hook up end meeting from api 2017-08-02 13:06:16 -07:00
Richard Alam
b072b6e354 - log start voice recording message 2017-08-02 11:32:43 -07:00
Richard Alam
f6419cce4c - ignore messages we don't want to record 2017-08-02 11:32:22 -07:00
Richard Alam
d169c417bc - start recording voice conf when first user joins 2017-08-02 11:31:30 -07:00
Richard Alam
69268f8628 - fix exception when recording pencil whiteboard shape 2017-08-02 11:31:01 -07:00
Richard Alam
4889f66361 Merge branch 'restrict-remote-layout' of https://github.com/capilkey/bigbluebutton into capilkey-restrict-remote-layout 2017-08-01 17:35:47 -07:00
Chad Pilkey
89ea33359c only apply remote layouts to non-moderators 2017-08-01 18:51:20 -04:00
Richard Alam
3b44d0eac2 - fix issue where late joiners displays the wrong slide 2017-08-01 14:50:44 -07:00
Chad Pilkey
c8caf39d50 make layout data instance based instead of static 2017-07-31 19:02:45 -04:00
Richard Alam
bd0ae4f969 Fix #4159 
- When a user is in the voice conference using webrtc and the browser refreshes, FS doesn't detect that the
   webrtc connection has gone down so it is not able to send a user left voice conf message. It would take a
   media timeout for FS to send a user left voice conf event. Remove the user from voice list when user leaves
   the meeting. Not sure how this behaves on auto-reconnect of bbb-apps while the webrtc connection is actually
   still working.
 2017-07-31 14:47:39 -07:00
Richard Alam
8345a97960 - log more messages 2017-07-31 13:55:48 -07:00
Richard Alam
991d704d43 - fix wrong reason when meeting ends due to duration 2017-07-31 13:55:11 -07:00
Richard Alam
510d7717ab Merge pull request #4167 from ritzalam/fix-user-leaving 
tracking user disconnects
 2017-07-31 13:58:18 -04:00
Richard Alam
747c197239 - add analytics actor for logging messages we are interested in. Better to do this in another app 
but don't want to create another app for now. Might extract this sometime in the future.
 2017-07-31 10:54:05 -07:00
Chad Pilkey
56b362e3c7 Merge pull request #4165 from capilkey/2.0-message-recording 
Replace old Java event recording with Scala equivalent
 2017-07-31 13:24:18 -04:00
Anton Georgiev
f6699b10f7 Merge pull request #4166 from antobinary/request-wb-access-on-meteor-start 
Inform meteor app about current multi-user property in each meeting
 2017-07-31 13:21:51 -04:00
Anton Georgiev
39565e5a72 switch to a new sync message on html5 only redis channel 2017-07-31 12:12:16 -04:00
Chad Pilkey
f69a70bb3b remove old java record classes in akka-apps 2017-07-31 12:07:06 -04:00
Chad Pilkey
1f8aa4618f new akka-apps record structure 2017-07-31 12:02:13 -04:00
Richard Alam
3a6225da2a - reset timestamp of when last user left when a user joins the meeting 2017-07-31 08:55:58 -07:00
Richard Alam
4c92969a45 Merge branch 'sharednotes-limit' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-sharednotes-limit 2017-07-31 08:44:14 -07:00
Richard Alam
2d2261f36a Merge branch 'handle-presenter-gone' of https://github.com/antobinary/bigbluebutton into antobinary-handle-presenter-gone 2017-07-31 08:32:42 -07:00
Pedro Beschorner Marin
77603a62c8 Limiting the number of shared notes 2017-07-30 22:11:13 +00:00
Anton Georgiev
88055c5ca9 add sync of whiteboard access on meteor start 2017-07-28 17:57:41 -04:00
Anton Georgiev
173ba4531a stop screenshare and poll on presenter leave 2017-07-28 17:16:03 -04:00
Richard Alam
eb994c09a3 - do not send extra messages on validate token response 
- make flash client explicitly send user join message to server
 2017-07-27 13:42:36 -07:00
Richard Alam
156436d34a - reset last user left timestamp when user joins meeting 2017-07-27 12:13:05 -07:00
Richard Alam
3fd747a9b3 - log when meeting ends 2017-07-27 11:35:26 -07:00
Richard Alam
6df8305dac - log reason when meeting expires 2017-07-27 10:18:03 -07:00
Richard Alam
d39e823a85 Merge branch 'akka-transcode-new-messages' of https://github.com/prlanzarin/bigbluebutton-1 into prlanzarin-akka-transcode-new-messages 2017-07-27 07:53:27 -07:00
Richard Alam
6fb08c1396 - convert over lock setting into 2x messages 2017-07-26 13:19:19 -07:00
Richard Alam
36e8f02667 - fix meeting expiry 2017-07-25 15:02:07 -07:00
Richard Alam
b1ad1668dd - fix test compile errors 2017-07-25 13:44:18 -07:00
Richard Alam
3921eaf36f - display timer 
- make sure talking indicator is off when user is muted
 2017-07-25 13:43:35 -07:00
Richard Alam
d0b7e9c121 - assign presenter when presenter leaves 2017-07-25 13:41:56 -07:00
Richard Alam
59e149a6e1 - display meeting time remaining 2017-07-25 11:54:13 -07:00
Pedro Beschorner Marin
cd34d2c139 Merge remote-tracking branch 'bbb-2x-mconf' into transcode-new-messages 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
 2017-07-25 14:47:21 +00:00
Pedro Beschorner Marin
d50f65fce1 Moved akka-transcode messages to 2.0 format 2017-07-25 13:23:20 +00:00
Richard Alam
8415300b3f - fix breakout time remaining 2017-07-24 14:44:15 -07:00
Richard Alam
ab5cad41e7 - handle some of breakout messages 
- timer still not working
 - listen not working
 - breakout users list not working
 2017-07-24 12:56:09 -07:00
Richard Alam
555302f11e - try to fix messaging of breakout rooms 2017-07-24 10:39:29 -07:00
Richard Alam
e89c20f245 - need to fix client to handle breakout messages properly 2017-07-23 18:39:00 -07:00
Richard Alam
8305782294 - create breakout room 
- send join url to client
 2017-07-23 18:14:26 -07:00
Richard Alam
8c2eeac294 - modify how we set meeting state 
- cleanup
 2017-07-22 08:42:02 -07:00
Richard Alam
1269347289 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into fix-breakout-room-messaging 2017-07-21 20:55:40 -07:00
Richard Alam
10c4846b92 - provide a way to filter messages we want to record 2017-07-21 20:25:41 -07:00
Richard Alam
2abedb7276 - try to fix breakout rooms 2017-07-21 19:00:00 -07:00
Richard Alam
47f012f08f - start fixing breakout rooms 2017-07-21 14:15:51 -07:00
Chad Pilkey
d68229f182 fix the resize and move data storage 2017-07-21 15:53:43 -04:00
Chad Pilkey
c8f38ebae1 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into cleanup-old-1.1-apps 2017-07-21 14:30:51 -04:00
Chad Pilkey
043c55e0bf Merge remote-tracking branch 'upstream/bbb-2x-mconf' into cleanup-old-1.1-apps 2017-07-21 13:55:06 -04:00
Richard Alam
ba2e99ed0e Merge branch 'work-on-meeting-lifcycle-2' of https://github.com/ritzalam/bigbluebutton into ritzalam-work-on-meeting-lifcycle-2 2017-07-20 18:19:00 -07:00
Richard Alam
f1b4f87752 Merge branch 'late-joiner-webrtc-screenshare' of https://github.com/antobinary/bigbluebutton into antobinary-late-joiner-webrtc-screenshare 2017-07-20 17:41:55 -07:00
Richard Alam
905f1a8e71 - clean up 2017-07-20 17:33:49 -07:00
Chad Pilkey
c5e9f4401e change Polls.scala to use better ArrayBuffer to Array conversion 2017-07-20 18:58:50 -04:00
Chad Pilkey
3a824e13db cleaned up pre-2.0 user messages 2017-07-20 18:57:55 -04:00
Richard Alam
6be6e9191a - try to fix webcam list 2017-07-20 10:09:01 -07:00
Richard Alam
d7e1a23022 - continue implement guest policy 2017-07-19 19:24:43 -07:00
Richard Alam
d488ff745d - implement guest policy 2017-07-19 14:59:36 -07:00
Richard Alam
56ae9ca9a8 - move handlers to a different package 2017-07-19 11:40:30 -07:00
Richard Alam
a61030a95f - track meeting inactivity and expiry in akka-apps 2017-07-18 14:47:42 -07:00
Richard Alam
03ea339e21 Merge branch 'bbb-2x-mconf' into work-on-meeting-lifcycle 2017-07-17 19:37:38 -07:00
Richard Alam
810a027907 Merge branch '2x-transcode-screenshare-merge' of https://github.com/prlanzarin/bigbluebutton-1 into prlanzarin-2x-transcode-screenshare-merge 2017-07-17 18:49:58 -07:00
Richard Alam
e62efc3820 - try to figure out why meeting doesn't end when user leaves 2017-07-17 14:59:31 -07:00
Anton Georgiev
d8dc01d333 display current webrtc screenshare to late joiners (if broadcasting) 2017-07-17 17:48:44 -04:00
Richard Alam
61147dbb67 - try passing state around to track meeting expiry 2017-07-17 14:30:08 -07:00
Richard Alam
1f50ec2da7 - send destroy meeting to BBBActor when meeting ends 2017-07-17 09:13:07 -07:00
Richard Alam
eb9a96348a - restructure handlers to make it easier to test 2017-07-16 18:34:44 -07:00
Richard Alam
43edb0ea4c - convert get users query to 2x 2017-07-16 14:06:05 -07:00
Richard Alam
bf1031374a - pass timeout expire when last user leaves from bbb-web to akka-apps 2017-07-16 08:11:48 -07:00
Richard Alam
8994c7f644 Merge branch 'bbb-2x-mconf' into implement-meeting-expiry 2017-07-16 07:49:45 -07:00
Richard Alam
0f39d99ce5 - implement meeting expiry 2017-07-15 19:10:04 -07:00
Chad Pilkey
f4a5286005 remove pre-2.0 breakout room code 2017-07-15 19:00:18 -04:00
Chad Pilkey
1bb72e6391 clean up pre-2.0 voice message code 2017-07-15 17:33:25 -04:00
Chad Pilkey
cc1e47ecef fixed the poll annotation drawing 2017-07-15 15:34:30 -04:00
Chad Pilkey
2dfd202a0b reorganized akka-apps whiteboard, cleaned up caption and poll 2017-07-15 15:31:49 -04:00
Richard Alam
a0467f319c Merge branch 'bbb-2x-mconf' into work-on-meeting-lifcycle 2017-07-15 09:30:02 -07:00
Richard Alam
80213da06e - try writing test 
- start implementing meeting inactivity
 - updated scalariform to format scala code
 2017-07-14 14:50:34 -07:00
Chad Pilkey
3c60131a5c remove pre-2.0 layout message code 2017-07-14 16:57:20 -04:00
Chad Pilkey
816daf29ae remove pre-2.0 poll message code 2017-07-14 16:10:17 -04:00
Chad Pilkey
5ebdd61d3b remove pre-2.0 presentation message code 2017-07-14 14:19:20 -04:00
Richard Alam
08fe6cea81 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into work-on-meeting-lifcycle 2017-07-14 07:25:31 -07:00
Richard Alam
f2eebff87f - init test data properly 2017-07-13 19:32:58 -07:00
Richard Alam
4d12ed57fd - remove log noise 2017-07-13 18:16:18 -07:00
Richard Alam
5bccf11319 Merge branch 'convert-global-audio-messages' of https://github.com/capilkey/bigbluebutton into capilkey-convert-global-audio-messages 2017-07-13 17:33:22 -07:00
Chad Pilkey
86da035674 move the global audio messages to the 2.0 format 2017-07-13 18:09:15 -04:00
Richard Alam
e7d1bd6a26 - make outgwbus replaceable for testing 2017-07-13 14:55:58 -07:00
Anton Georgiev
701ada98a8 unsubscribe from screenshare bus channel 2017-07-13 12:27:30 -04:00
Anton Georgiev
3d420cf459 force disconnect for all users on meeting end 2017-07-13 11:58:16 -04:00
Anton Georgiev
1687dc7281 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs 2017-07-12 19:43:38 -04:00
Anton Georgiev
d33c1b03ae handle DestroyMeetingSysCmdMsg on akka-apps 2017-07-12 19:21:01 -04:00
Richard Alam
d48f46c5e7 - try renaming deskshare to screenshare 2017-07-12 10:50:27 -07:00
prlanzarin
e3cf771891 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into 2x-transcode-screenshare-merge 2017-07-12 15:14:07 +00:00
Richard Alam
19e98b22f5 Merge branch 'fs-webrtc-screenshare' of https://github.com/ritzalam/bigbluebutton into ritzalam-fs-webrtc-screenshare 2017-07-11 17:08:38 -07:00
Pedro Beschorner Marin
2097b611ed Merge remote-tracking branch 'prlanzarin/1.1-transcode-screenshare-merge' into bigbluebutton/bbb-2.x-mconf 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
	record-and-playback/core/scripts/rap-process-worker.rb
 2017-07-11 20:41:38 +00:00
Richard Alam
b04519ef0f FreeSWITCH webrtc screenshare 
- use webrtc screenshare using FS Verto
 - publish screenshare as rtmp to red5
 - flash clients view screenshare from red5 rtmp

 Fix mute/unmute/talking of user in voice conference
 2017-07-11 13:31:56 -07:00
Anton Georgiev
f6ef0ddf75 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs 2017-07-11 15:35:17 -04:00
Anton Georgiev
199af1773b send userLeave on user eject 2017-07-11 15:25:51 -04:00
Anton Georgiev
c5ca6a2fcc red5 closes connection when user is ejected 2017-07-11 14:56:35 -04:00
Richard Alam
02d9c6717b Merge branch 'implement-bbb-web-msgs' of https://github.com/antobinary/bigbluebutton into antobinary-implement-bbb-web-msgs 2017-07-11 08:12:18 -07:00
Richard Alam
40d00282f5 - send deskshare messages from fsesl 2017-07-10 19:17:51 -07:00
Chad Pilkey
f6d92e5a50 add deskshare msg handlers to akka-apps 2017-07-10 18:12:06 -04:00
Anton Georgiev
c810c2cf73 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs 2017-07-10 17:26:04 -04:00
Anton Georgiev
797b2904aa handle eject user from meeting (a.k.a. kick) 2017-07-10 15:36:26 -04:00
Richard Alam
7a7712d986 - start implementing lock settings 2017-07-09 15:00:13 -07:00
Anton Georgiev
0e9dcee399 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs 2017-07-09 11:09:23 -04:00
Richard Alam
8d91ef8132 - convert several old client messages to new ones 2017-07-09 07:44:29 -07:00
Anton Georgiev
35b87ee069 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs 2017-07-09 10:37:34 -04:00
Anton Georgiev
900518fb1b cleanup 2017-07-09 10:26:55 -04:00
Richard Alam
5dbb8d5515 - implement emoji status message 2017-07-08 13:39:41 -07:00
Richard Alam
77de38e2f3 Merge branch 'move-chat-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-chat-messages-2x 2017-07-08 08:41:20 -07:00
Richard Alam
0cf4227273 Merge branch 'implement-bbb-web-msgs' into implement-meeting-status 2017-07-08 08:04:13 -07:00
Richard Alam
2212d95a28 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into implement-meeting-status 2017-07-08 07:23:30 -07:00
Richard Alam
1320988a95 - handle register user properly 2017-07-08 07:22:45 -07:00
Chad Pilkey
bf9f6df9b1 remove all 1.1 chat messaging code 2017-07-07 20:16:14 -04:00
Chad Pilkey
550b880db7 convert chat messages to 2x 2017-07-07 19:14:00 -04:00
Richard Alam
70c7ebc1a1 - continue removing old messages in akka-apps 2017-07-07 14:23:56 -07:00
Anton Georgiev
0ec660c8d3 handle assign presenter in flash client and akka apps 2017-07-07 10:32:38 -04:00
Richard Alam
a0ed7685ce - continue removing old code 2017-07-06 18:48:26 -07:00
Richard Alam
2945c0e6fc - continue removing old messages 2017-07-06 14:50:34 -07:00
prlanzarin
a9bbdd11aa Now correctly pointed akka-transcode ffmpeg path 
Reverted akka-apps video-broadcast application.conf
 2017-07-06 15:33:04 +00:00
prlanzarin
2d8e04ffd8 Transcoder now only relays RTP to RTMP video 
Updated akka-transcode base SDP to use AVPF. Will make it dynamic later

Changed akka-transcode ffmpeg base path to packaged ffmpeg
 2017-07-06 13:02:29 +00:00
Richard Alam
246fded4ff - start removing old out messages 2017-07-05 14:08:30 -07:00
Klauswk
ebb3984828 Merge branch 'bbb-2x-mconf' into html5-2x-getAll-messages 2017-07-05 15:28:35 -03:00
Richard Alam
44f7b0c622 - remove old users model 2017-07-05 11:20:48 -07:00
Richard Alam
53bdd7f008 - handle messages from akka-apps to update meeting state in bbb-web used to return 
in GetMeetingInfo API requests
 2017-07-04 12:58:26 -07:00
Richard Alam
955b162915 - send new presentation conversion progress messages 2017-07-04 10:32:30 -07:00
Richard Alam
dfabf2f224 Merge branch '2.0-sharednotes-messages' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-2.0-sharednotes-messages 2017-07-04 07:02:11 -07:00
Pedro Beschorner Marin
962deb555d Removed synchronized blocks from sharednotes akka-app 2017-07-03 20:22:13 +00:00
Pedro Beschorner Marin
0c3d5990ff Replaced sharednotes mutable Stack undo/redo structures for immutable List 2017-07-03 17:29:39 +00:00
Pedro Beschorner Marin
79cf6bb623 Moved sharednotes messages to 2.0 format 2017-07-03 17:28:12 +00:00
Anton Georgiev
189230cc43 Merge branch 'sync' into presentation-and-slides 2017-06-30 14:12:25 -04:00
Anton Georgiev
2e0f6d8610 trigger syncing with state from akka-apps 2017-06-30 11:19:11 -04:00
Anton Georgiev
19d89c6f92 trigger syncing with state from akka-apps 2017-06-30 10:58:49 -04:00
Richard Alam
50acc517af Merge branch 'fix-2.0-layout' of https://github.com/capilkey/bigbluebutton into capilkey-fix-2.0-layout 2017-06-29 18:20:40 -07:00
Chad Pilkey
4e5df30ac4 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into fix-2.0-layout 2017-06-29 16:57:28 -04:00
Richard Alam
fcf41c9f61 - move to different packages 2017-06-29 13:55:37 -07:00
Chad Pilkey
9f904e6267 reorganized the layout code in akka-apps and fixed layout broadcast 2017-06-29 16:55:25 -04:00
Richard Alam
a11c45fa02 - implement handlers for guest policy 2017-06-29 11:34:08 -07:00
Chad Pilkey
15c938e9cd fixed layout message response and removed redundant props 2017-06-29 14:32:31 -04:00
Richard Alam
29052e6f79 - send layout response to requester user instead of whole meeting 2017-06-29 07:31:23 -07:00
Richard Alam
0aed46c986 - add validate token handler tests 2017-06-28 14:56:35 -07:00
Richard Alam
f4bf6912d4 - add create meeting request test for BigBlueButtonActor 2017-06-28 09:01:45 -07:00
Richard Alam
04e55a1dd4 Merge branch 'move-caption-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-caption-messages-2x 2017-06-28 07:47:56 -07:00
Richard Alam
30827f680e - move messages into different package 2017-06-27 19:44:47 -07:00
Richard Alam
a32193bd68 - reorganize messages 2017-06-27 15:01:42 -07:00
Richard Alam
03010eedb2 - put users messages in one file 
- put guest policy into it's own class
 2017-06-27 13:05:38 -07:00
Chad Pilkey
4c66393dbd Merge remote-tracking branch 'upstream/bbb-2x-mconf' into move-caption-messages-2x 2017-06-26 18:09:56 -04:00
Richard Alam
f4bcb2421a - send poll voting to client 2017-06-26 14:39:52 -07:00
Richard Alam
2316e73c26 Merge branch '2.0-Polls' of https://github.com/antobinary/bigbluebutton into antobinary-2.0-Polls 2017-06-26 14:00:38 -07:00
Chad Pilkey
7c19972d24 remove pre-2.0 caption server code 2017-06-26 16:47:18 -04:00
Chad Pilkey
d690b49898 clear transcript owner when they leave the meeting 2017-06-26 16:46:09 -04:00
Anton Georgiev
f98bd01c3f send poll result without extra stringify 2017-06-26 15:45:15 -04:00
Richard Alam
99046fb685 - handle emoji status changed message in client 2017-06-26 12:38:00 -07:00
Chad Pilkey
76026da06c moved caption messages to 2.0 format 2017-06-26 15:00:32 -04:00
Richard Alam
9dc41437e8 - handle user left 2017-06-26 10:34:22 -07:00
Richard Alam
dfa1557116 - display default presentation 2017-06-26 07:24:38 -07:00
Richard Alam
f7376e11c0 - get presentation info 2017-06-25 16:11:29 -07:00
Richard Alam
2931b719c6 - get presentation info 2017-06-25 13:26:37 -07:00
Richard Alam
9317cdfcc0 Merge branch 'capilkey-move-presentation-messages-2x' into merge-presentation 2017-06-25 11:25:23 -07:00
Richard Alam
34cab65b2e Merge branch 'move-presentation-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-presentation-messages-2x 2017-06-24 15:46:22 -07:00
Richard Alam
dd175bee89 - mute user 2017-06-24 14:56:06 -07:00
Richard Alam
ae4fc536b1 - fix use leaving voice conf 2017-06-24 06:47:19 -07:00
Richard Alam
77da487c60 - handle user muted and talking messages 2017-06-23 18:14:55 -07:00
Richard Alam
002a447273 - user talking message 2017-06-23 15:18:30 -07:00
Richard Alam
ceb4d74e55 - handle user join and left voice conference 2017-06-23 14:34:05 -07:00
Anton Georgiev
9a0a4d5669 work on displaying poll result annotation in flash client 2017-06-23 17:26:53 -04:00
Richard Alam
7ffd1a80bd - assign presenter when no presenter present 2017-06-23 11:12:17 -07:00
Chad Pilkey
1c226fd3af 2.0 presentation message work, presentation conversion msgs in bbb-web missing 2017-06-23 13:27:56 -04:00
Richard Alam
c4616f1ce0 - load modules after validate token 2017-06-22 14:42:10 -07:00
Richard Alam
c41b9b9a7a - display users list 2017-06-21 13:32:37 -07:00
Richard Alam
281108b1ab - send waitForApproval for guest on validate token 2017-06-21 10:49:08 -07:00
Richard Alam
30bafd7983 - try using new user data instead of BBBUser 2017-06-21 09:41:59 -07:00
Richard Alam
582cdf07ec - fix compile issue due to breaking of messages 2017-06-21 08:05:49 -07:00
Richard Alam
71d8b26ec1 - fake user generator so we can populate meeting with fake users for development 2017-06-20 13:44:26 -07:00
Ghazi Triki
46556a8405 Add Layout server messages for V2. 2017-06-20 17:14:46 +01:00
Richard Alam
bd46c386fc Merge branch 'bbb-2x-mconf' into refactor-client 2017-06-19 13:28:51 -07:00
Richard Alam
d0343b40d2 - delay processing of pre-uploaded presentation to make sure that meeting has been created before 
presentation conversion has completed.
 2017-06-19 13:04:07 -07:00
Richard Alam
bb8944570b - fix validate auth token race condition where the validate auto token is sent to the meeting before 
the meeting has been created
 2017-06-19 12:34:53 -07:00
Richard Alam
6021bb93c9 - send users, voice users, webcams on validate auth token 2017-06-19 11:21:51 -07:00
Ghazi Triki
5fc84b50f0 Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into breakout-rooms-2x-messages 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/UserJoinMeetingReqMsgHdlr.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala
#	bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/MessageBody.scala
#	bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Messages.scala
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
 2017-06-19 17:46:46 +01:00
Ghazi Triki
c7c39989a3 Added all breakout rooms events handlers in akka-bbb-apps project. 2017-06-19 16:57:36 +01:00
Richard Alam
e80a3de440 - put message into it's own sender 2017-06-17 19:28:43 -07:00
Richard Alam
e7ffcbfbe7 - merging latest bbb-2x-mconf 2017-06-16 18:12:29 -07:00
Richard Alam
5c76f413bb Merge branch '2.0-Polls' of https://github.com/antobinary/bigbluebutton into antobinary-2.0-Polls 2017-06-16 17:38:06 -07:00
Richard Alam
dc1c1e8b9e Merge branch 'move-whiteboard-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-whiteboard-messages-2x 2017-06-16 17:18:50 -07:00
Chad Pilkey
f3ab70f060 convert whiteboard messages to the 2.0 method and remove old 2017-06-16 18:09:25 -04:00
Anton Georgiev
522227da51 startPoll does not need to return anything. Avoid .get 2017-06-16 17:19:09 -04:00
Anton Georgiev
b3c323bdc7 cleanup 2017-06-16 17:05:12 -04:00
Anton Georgiev
c6e7a17085 sendGetCurrentPollRespMsg with Option[PollVO] 2017-06-16 17:03:21 -04:00
Anton Georgiev
b61fe6faaf send events straight to meeting eventBus 2017-06-16 14:54:38 -04:00
Anton Georgiev
77b78a1ae7 Polls 2.0 - the rest of the messages 2017-06-16 12:01:14 -04:00
Anton Georgiev
882b4215d4 added Polls model, StartPollReqMsg and StartPollRespMsg 2017-06-16 11:51:07 -04:00
Richard Alam
5c84354715 - try to consolidate meeting state in one place 2017-06-15 19:09:32 -07:00
Richard Alam
596800e8d9 - breakdown handlers 2017-06-14 13:49:28 -07:00
Ghazi Triki
1e3f91bb6e Improve code and replace deprecated parts. 2017-06-14 15:11:38 +01:00
Richard Alam
326ba5e481 - put message into it's own hdlr 2017-06-13 19:26:04 -07:00
Richard Alam
b677b4490f - partially convert some messages 2017-06-13 14:42:02 -07:00
Pedro Beschorner Marin
15c6420e97 Merge tag 'v1.1.0' into 1.1-transcode 
tagging v1.1.0 release

 Conflicts:
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java
	bbb-web-api/src/main/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
	record-and-playback/core/scripts/rap-process-worker.rb
 2017-06-13 17:44:12 +00:00
Ghazi Triki
ed939d74a7 Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into breakout-rooms-2x-messages 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgDeserializer.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/LiveMeeting.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala
#	bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Messages.scala
 2017-06-13 17:58:46 +01:00
Richard Alam
0c189059ff - see if we can simplify routing of deserialized message 
- user TypeTag instead of Manifest
 2017-06-12 18:15:17 -07:00
Richard Alam
55209b0685 - simplify deserializing of messages 2017-06-12 14:12:28 -07:00
Ghazi Triki
0478a3f658 First pass moving breakout rooms messages to v2 format. 2017-06-12 20:32:10 +01:00
Richard Alam
c0cc7138b3 - add new user joined voice event message 2017-06-12 11:39:53 -07:00
Richard Alam
de0001bb74 - webcam streams model 2017-06-11 18:07:19 -07:00
Richard Alam
35b449b199 - create new status models 2017-06-10 11:11:22 -07:00
Richard Alam
4727eb8e8e - send messages from fs to akka apps 2017-06-09 11:04:17 -07:00
Richard Alam
1ccf71cad7 - add new voice conf messages 2017-06-08 17:55:27 -07:00
Richard Alam
9b9b93c779 - record new messages 2017-06-08 13:11:46 -07:00
Pedro Beschorner Marin
d6b1dd09b9 Merge remote-tracking branch 'mconf-akka-transcoding' into 1.1-transcode 
Conflicts:
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/UsersMessageReceiver.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/VideoApp.scala
 2017-06-08 18:57:37 +00:00
Richard Alam
b3e5bd1c37 - remove jedis dependecy 2017-06-08 11:29:44 -07:00
Richard Alam
aa99cb45eb - use redis scala to record events to redis instead of jedis 2017-06-08 11:16:18 -07:00
Pedro Beschorner Marin
40aeabb41c Cleaning up some unused transcode akka-apps methods 2017-06-08 15:53:49 +00:00
Richard Alam
b6f1b6447d - start refactoring recording service 2017-06-07 14:48:33 -07:00
Pedro Beschorner Marin
555c7e351f Merge remote-tracking branch 'mconf-akka-transcoding' into merging-into-bbb-1.1 
Conflicts:
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/UsersMessageReceiver.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bbb-video/src/main/java/org/bigbluebutton/app/video/converter/H263Converter.java
	bigbluebutton-config/bin/bbb-conf
 2017-06-07 18:18:54 -03:00
Pedro Beschorner Marin
719ef1377a Merge remote-tracking branch 'mconf' into merging-into-bbb-1.1 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bbb-video/src/main/java/org/bigbluebutton/app/video/converter/VideoRotator.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/resources/prod/MconfLive.html
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/BrowserCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
	bigbluebutton-config/bin/bbb-conf
	record-and-playback/core/lib/recordandplayback/generators/audio_processor.rb
	record-and-playback/core/lib/recordandplayback/generators/video.rb
	record-and-playback/core/scripts/rap-worker.rb
	record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js
	record-and-playback/presentation/scripts/process/presentation.rb
	record-and-playback/presentation/scripts/publish/presentation.rb
 2017-06-07 19:31:15 +00:00
Richard Alam
7e14c133b3 - send start/stop broadcasting webcam from client to server 
- send webcam broadcast started/stopped event from server to client
 2017-06-07 11:08:46 -07:00
Richard Alam
5ef4dd9e88 - change how we deserialize message so we can log errors 
- add helper methods to add routing info for messages
 - add a way to deserialize message from client
 2017-06-06 14:25:40 -07:00
Richard Alam
7f9809459c - try to simpify deserializer 2017-05-31 11:50:59 -07:00
Richard Alam
2999e71530 - remove meeting model 2017-05-29 18:59:00 -07:00
Richard Alam
47b0ada045 - track meeting status 2017-05-29 14:41:37 -07:00
Richard Alam
84bfd93701 - handle register user message 2017-05-29 12:17:25 -07:00
Richard Alam
bd83dc012e - fix test 2017-05-28 18:12:52 -07:00
Richard Alam
240176ca32 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into move-java-classes-from-bbb-web-to-bbb-common-web 2017-05-27 18:30:50 -07:00
Richard Alam
272df3c23d - send message to client 2017-05-26 20:00:33 -07:00
Richard Alam
73ec6bb25d - implement validate auth token 2017-05-26 10:04:38 -07:00
Chad Pilkey
09ec1e6151 first pass at multi whiteboard cursors 2017-05-25 23:45:27 -04:00
Richard Alam
18cce3a818 - send and handle meeting created event 2017-05-25 14:34:46 -07:00
Richard Alam
72f7272eb7 - handle create meeting request message 2017-05-25 13:02:26 -07:00
Richard Alam
e56a758c5f - send create message from bbb-web 2017-05-24 15:19:03 -07:00
Richard Alam
467598ffd2 - turn off keep alive message 2017-05-23 17:36:05 -07:00
Richard Alam
d30b5c4aac - start up the client 2017-05-19 20:00:20 -07:00
Pedro Beschorner Marin
6966bfc5af Added VideoApp in akka-apps to manage the video transcoding 2017-05-17 18:01:25 +00:00
Mario Gasparoni
9a3fc66687 Stop Meeting Transcoders 
Stop any remaining transcoder used by the meeting. Useful for mediaSource transcoders.

Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
 2017-05-17 17:43:30 +00:00
Mario Gasparoni
16698f7489 Introducing bbb-transcode-akka 
Conflicts:
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/VoiceApp.scala
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java
	akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/VideoTranscoderObserver.java
	akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/ffmpeg/FFmpegCommand.java
	akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/ffmpeg/FFmpegConstants.java
	akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/ffprobe/FFProbeCommand.java
	akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/processmonitor/ProcessMonitor.java
	akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/processmonitor/ProcessMonitorObserver.java
	akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/processmonitor/ProcessStream.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessageFromJsonConverter.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/Constants.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/IMessagingService.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageReceiver.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/ReceivedMessageHandler.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/RedisMessagingService.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/Service.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallAgent.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallAgentObserver.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/GlobalCall.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeer.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeerManager.java
	bbb-voice/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
	bbb-voice/src/main/webapp/WEB-INF/red5-web.xml
 2017-05-17 15:54:44 +00:00
Richard Alam
aeb4445453 - finish wiring up actor system for bbb-apps 2017-05-17 08:20:01 -07:00
Richard Alam
f610e4e2ce Merge branch 'move-java-classes-from-bbb-web-to-bbb-common-web' of github.com:ritzalam/bigbluebutton into move-java-classes-from-bbb-web-to-bbb-common-web 2017-05-12 15:34:54 -07:00
Richard Alam
c0e4a4d681 - handle json message in akka apps 2017-05-12 15:33:46 -07:00
Richard Alam
a077748c57 - start setup akka system for bbb-apps 2017-05-12 13:11:28 -07:00
Richard Alam
76a6d99ca3 - move java classes from bbb-web into bbb-common-web 2017-05-10 13:22:50 -07:00
Richard Alam
0c200871da - add Jackson Json dependencies 2017-05-09 14:19:22 -07:00
Richard Alam
422ee08ea1 - setup tests 2017-05-09 11:47:44 -07:00
Richard Alam
2aa12e9301 - comment out println 2017-05-08 12:57:32 -07:00
Richard Alam
ddf5eb9caa - upgrade dependencies versions 2017-05-08 12:43:19 -07:00
Richard Alam
a97dd6ec58 Merge pull request #16 from pedrobmarin/life-cycle-management 
Moving the meeting life cycle management from bbb-web to akka-apps
 2017-05-04 10:22:06 -04:00
Richard Alam
b1740ebec5 Merge pull request #17 from capilkey/multi-user-2.0-take3 
Updates to make the text tool work
 2017-05-04 10:21:39 -04:00
Chad Pilkey
85d525172b rewrote the text tool to be like other annotations and removed redundant processing 2017-05-03 18:06:26 -04:00
Pedro Beschorner Marin
66a12c9c7a Moving the meeting life cycle management from bbb-web to akka-apps 2017-05-03 17:02:16 +00:00
Richard Alam
401d0f8b78 - minor restructure 2017-04-28 14:21:37 -07:00
Richard Alam
cce0fdd0be - add chat models 2017-04-28 14:20:46 -07:00
Richard Alam
9a2c017375 - modify some handlers 2017-04-27 08:37:37 -07:00
Richard Alam
0262ee97fc - access registered users through RegisteredUsers object 2017-04-26 10:47:41 -07:00
Richard Alam
859e161729 - manipulate users through Users object 2017-04-26 10:31:29 -07:00
Richard Alam
488b038731 - hardcode test results 2017-04-25 13:34:30 -07:00
Richard Alam
c94fe7a9c6 - switch from java map to scala immutable map 2017-04-25 13:21:08 -07:00
Richard Alam
c5edabd33d - use lenses when changing case class values 2017-04-25 13:20:41 -07:00
Richard Alam
2fd18e7c09 Merge branch 'multi-user-2.0' of https://github.com/capilkey/bigbluebutton into bbb-2.x-dev-mconf 2017-04-25 11:21:34 -07:00
Richard Alam
e61220e933 Merge branch 'bbb-2.x-dev' of github.com:ritzalam/bigbluebutton into bbb-2.x-dev-mconf 2017-04-25 11:06:31 -07:00
Richard Alam
d4950a769d - fix assign presenter 2017-04-21 15:39:43 -07:00
Richard Alam
77c4b6fae8 - checng how polling module handle messages 2017-04-21 14:51:32 -07:00
Chad Pilkey
c97aed4057 line smoothing, shape location zoom drift fix, shape drawing efficiency 2017-04-21 17:29:31 -04:00
Richard Alam
d7f7ccbee9 - remove inGW from live meeting 2017-04-21 09:01:28 -07:00
Richard Alam
ae207f6671 - remove outGW from live meeting 2017-04-21 08:58:52 -07:00
Richard Alam
0bb9a0244b - make users model private 2017-04-21 08:48:45 -07:00
Richard Alam
535278a6a8 - do not use users model 2017-04-21 07:39:55 -07:00
Richard Alam
c7d7b91f76 - refactor UsersModel 2017-04-20 21:41:54 +00:00
Richard Alam
f3b7d21202 - remove Role class 2017-04-20 20:46:42 +00:00
Richard Alam
76d58851bb - extract our users and registered users 2017-04-20 20:38:18 +00:00
Richard Alam
dc6be589e2 - move handlers from livemeeting to meetingactor 2017-04-20 18:54:33 +00:00
Richard Alam
339fa1fa7a - move livemeeting into runningmeeting 2017-04-20 17:56:26 +00:00
Richard Alam
1f9a608e3c - move MeetingActor class 2017-04-20 17:32:36 +00:00
Richard Alam
b0910aecf3 - move RunningMeeting class 2017-04-20 16:02:18 +00:00
Richard Alam
f035356bc7 - move LiveMeeting class 2017-04-20 15:56:12 +00:00
Richard Alam
a9590976c2 - allow setting default guest policy for meeting 2017-04-18 19:45:32 +00:00
Richard Alam
b8de0c9231 - add authorized role to registered user 2017-04-17 21:23:17 +00:00
Richard Alam
262c7250c8 Merge branch 'master' with bbb-mconf 2017-04-17 15:57:31 +00:00
Richard Alam
6717308530 Check userId when validating token 
- check if the client validating the token mathes the userId of the registered user. If
   we don't, the client can pass any token and impersonate other users.
 2017-04-11 19:32:18 +00:00
Pedro Beschorner Marin
4beed571fa Also keep reconnecting voice users that are in listen only 2017-04-10 15:15:39 +00:00
Pedro Beschorner Marin
86841167e1 Merge remote-tracking branch 'pedrobmarin/reconnection-timeout' into mconf/mconf 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersModel.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConference.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCalls.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
 2017-04-07 21:00:30 +00:00
Richard Alam
6537e99981 Merge branch 'multiuser-whiteboard' of https://github.com/capilkey/bigbluebutton into merge-multi-user-whiteboard 2017-04-06 19:12:42 +00:00
Chad Pilkey
1a78091d01 multi-user whiteboard little bit of polish 2017-04-05 19:54:40 -04:00
Chad Pilkey
f7b9782ef3 multi-user whiteboard clear works 2017-04-04 16:43:15 -04:00
Pedro Beschorner Marin
f59e42bb02 Merge remote-tracking branch 'bigbluebutton/master' into merging-into-bbb-1.1 2017-04-04 20:42:15 +00:00
Pedro Beschorner Marin
84fd8d4101 Branding back to BigBlueButton and adding back some of the client images we removed. This need to be reviewed to avoid having all this unused images! 2017-04-03 17:06:16 +00:00
Chad Pilkey
1f5aff74b9 multi-user whiteboard undo works 2017-03-30 19:26:08 -04:00
Chad Pilkey
14d8c8dea4 multi-user whiteboard gethistory now works 2017-03-30 16:48:34 -04:00
Chad Pilkey
cc2c461df3 first pass as multiuser whiteboard, can mutli draw 2017-03-29 20:12:15 -04:00
Pedro Beschorner Marin
0ab207c997 Merge remote-tracking branch 'mconf/mconf' 2017-03-21 19:47:11 +00:00
Pedro Beschorner Marin
c74cc682c4 Merge remote-tracking branch 'mconf/mconf' 2017-03-20 19:45:59 +00:00
Richard Alam
e6a121d3bc Fix presentation slide coordinates 
Forgot to assign the values correctly.
 2017-02-14 16:05:16 +00:00
Richard Alam
cb161ac118 - when we get invalid coordinate for presentation slide, change coordinate so it falls within bounds 2017-02-13 20:43:04 +00:00
Ghazi Triki
dfbf8c8c0a Avoid converting some pptx files with certain properties and inform the user. 2017-01-30 19:50:10 +01:00
Anton Georgiev
87c71f2d86 fix for the case where last voice user was kicked 2017-01-25 00:02:11 -02:00
Anton Georgiev
2f702d89d4 fix for the case where last voice user was kicked 2017-01-11 19:14:31 -05:00
Pedro Beschorner Marin
980c5d2ad0 Merge pull request #365 from alexandrekreis/mconf 
Whiteboard annotations on deskshare video
 2017-01-03 15:59:25 -02:00
Ghazi Triki
4c4d768883 Added new "webcamsOnlyForModerator" parameter for create meeting API. 2017-01-02 16:56:32 +01:00
Pedro Beschorner Marin
14b480c8ce Working on avoiding reconnection when ending a meeting by API call 2016-12-09 20:33:03 +00:00
Richard Alam
8242a8b871 - eject users from the voice conference when the meeting is ended through the 
API
 2016-12-02 17:05:17 +00:00
Richard Alam
145c40a459 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into upgrade-red5-nov-22-2016-snapshot 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
 2016-11-24 23:00:56 +00:00
Richard Alam
68e6060166 Merge pull request #3476 from riadvice/request-join-url-update 
RequestBreakoutJoinURL returns two join urls
 2016-11-22 13:39:18 -05:00
Richard Alam
7242b90412 Merge pull request #3470 from riadvice/monitoring-schedule-period 
Update schedule period of MonitorNumberOfWebUsers.
 2016-11-22 13:38:40 -05:00
Richard Alam
3ead2b449b - minor formatting from IDE 2016-11-22 15:59:05 +00:00
Ghazi Triki
59a0f4665d Updated RequestBreakoutJoinURL to return two join urls, the first with redirection enable and the second without redirection. 2016-11-21 18:01:22 +01:00
Felipe Cecagno
8f4ca962cc Merge branch 'undo-stack-size' of github.com:pedrobmarin/bigbluebutton into mconf 
Conflicts:
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
 2016-11-20 21:20:16 -02:00
Felipe Cecagno
1014aa77fa changed possible values for inactivity_deadline to (1 minute; 6 hours), and inactivity_timeleft to (30 seconds; 30 minutes); changed client strings related to inactivity 2016-11-20 15:50:42 -02:00
Felipe Cecagno
faba97fdee Merge branch 'inactivity-metadata' of github.com:pedrobmarin/bigbluebutton into mconf 
Conflicts:
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
 2016-11-20 00:41:28 -02:00
kreismann
4d13d7e20f Updating poll id and setting polling whiteboard id according to the poll Id 2016-11-17 16:04:19 -02:00
Ghazi Triki
40e16b0002 Use local context instead of the global context for scheduleOnce. 2016-11-17 14:12:41 +01:00
Ghazi Triki
727a671b55 Update schedule period of MonitorNumberOfWebUsers. 2016-11-17 12:12:17 +01:00
Ghazi Triki
ab9f85b852 Delay sending DisconnectAllUsers at EndMeeting handler in akka-bbb-apps to avoid a synchronisation issue noticed when users are streaming using RTMPT. 2016-11-17 11:16:14 +01:00
Pedro Beschorner Marin
e87420e44c Fixed a maximum stack size for shared notes undo feature and refactored resync detection 2016-11-16 14:41:31 +00:00
Pedro Beschorner Marin
7d43bed1ff Renamed inactivity metadata ids to fit a naming pattern 2016-11-01 19:58:42 +00:00
Pedro Beschorner Marin
4331aaa8d6 Any sign of activity will interrupt and clean the inactivity warning message 2016-10-31 17:28:56 +00:00
Pedro Beschorner Marin
1e014f9298 Included metadata reading at server. Setting meeting timeleft and deadline as meta_inactivity-timeleft and meta_inactivity-deadline on create params 2016-10-31 16:51:07 +00:00
Pedro Beschorner Marin
5416d01dcc Syncing note if a problem is detected while patching 2016-10-26 17:25:49 +00:00
Pedro Beschorner Marin
67189dff4e Sending sharednotes undo and redo status with current documents message as client starts 2016-10-24 15:42:45 +00:00
Pedro Beschorner Marin
c2decd1d2a Cleanup 2016-10-21 19:46:32 +00:00
Pedro Beschorner Marin
ddd1459d4c Refactored sharednotes UNDO operation and implemented REDO 2016-10-21 19:33:30 +00:00
Richard Alam
2facff623a Merge pull request #3411 from riadvice/unique-meeting-id-breakout-rooms 
Unique meeting id for breakout rooms & additional improvements
 2016-10-21 15:11:28 -04:00
Pedro Beschorner Marin
1eb1aea65e More sofisticated control of sharednotes undo button 2016-10-20 19:56:57 +00:00
Pedro Beschorner Marin
758adb3b8e First functional version of sharednotes undo operation 2016-10-20 17:52:37 +00:00
Ghazi Triki
2b7c7d84e4 Monitoring for number of user is not triggered for breakout rooms. 2016-10-17 10:15:02 +01:00
Ghazi Triki
415e34fb28 Added new property redirectOnJoin to CreateBreakoutRoomsRequest. 2016-10-14 21:28:44 +01:00
Ghazi Triki
c694f632ea Added redirect property to RequestBreakoutJoinURL. 2016-10-14 20:46:34 +01:00
Ghazi Triki
e187634c2a Using blank-presentation.pdf as default breakout room presentation when no current presentation is set to the parent room. 2016-10-14 16:33:17 +01:00
Ghazi Triki
b078628ad9 Store breakout room externalMeetingID to be used for generating join URL. 2016-10-13 17:17:47 +01:00
Ghazi Triki
5e002d845e Store breakout room sequence in akka-apps and bbb-web. 2016-10-13 12:53:53 +01:00
Ghazi Triki
ff9bc17c15 Send sequence number when creating breakout rooms and correctly generate a unique externalMeetingId for breakout rooms. 2016-10-12 19:55:20 +01:00
Ghazi Triki
f8beb9e4e7 Breakout rooms are now sorted by their sequence number. 2016-10-12 12:41:57 +01:00
Ghazi Triki
c95d208da7 Added sequence property breakout room. 2016-10-11 22:13:22 +01:00
Ghazi Triki
f7be426305 Breakout rooms refactoring: generated uniques external ID and internal ID. 2016-10-11 20:50:51 +01:00
Richard Alam
403665feb6 - add senderId when recording publish chat message 2016-10-07 21:45:56 +00:00
Fred Dixon
3552fca5c5 Merge pull request #3397 from riadvice/breakout-rooms-use-current-presentation 
Breakout rooms use current presentation slide
 2016-09-30 17:16:33 -04:00
Ghazi Triki
0e72d7523d Make breakout rooms use the selected slide of the current presentation as default presentation. 2016-09-28 22:19:48 +01:00
Richard Alam
3cfcf057bb - record the external userid in join events. 2016-09-26 17:33:39 +00:00
Richard Alam
17e465409d - custom poll was sent to the wrong actor. Route it to the correct meeting actor. 2016-08-31 22:13:47 +00:00
Chad Pilkey
1b72f8b077 add property to closed caption transcript model for the locale code 2016-08-30 17:10:03 -04:00
Richard Alam
9f3189f5f1 - merged new screen sharing UI 2016-08-23 15:21:28 +00:00
Richard Alam
34d8e2fbb3 Merge pull request #3294 from riadvice/breakout-room-logout-fix 
Fix for breakout room logout issue
 2016-08-18 11:55:58 -04:00
Ghazi Triki
6b93bd3130 Block user from joining any breakout room until all of them are created. 2016-08-18 15:12:57 +01:00
Ghazi Triki
9e32890d1b Postpone sending breakout rooms invitations to after all breakout rooms are successfully created. 2016-08-18 08:03:34 +01:00
Richard Alam
76e7e6d568 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into start-pause-stop-screen-sharing-with-webrtc 2016-08-17 18:44:49 +00:00
Richard Alam
6aab83589a Merge branch 'screenshare-1.1' of https://github.com/antobinary/bigbluebutton into antobinary-screenshare-1.1 
Conflicts:
	bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/ScreenShareApplication.scala
	bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/Screenshare.scala
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/MessageReceiver.as
 2016-08-17 18:40:28 +00:00
Anton Georgiev
9fb1c343f2 server side changes for switching recordType:String to record:Boolean 2016-08-11 21:30:06 +00:00
Anton Georgiev
f7cb97737d ask akka-apps if allowed to start screenshare 2016-08-11 19:18:56 +00:00
perroned
c057111367 Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
 2016-08-04 18:23:45 +00:00
perroned
4181ba2ee7 Merge remote-tracking branch 'anton/fix-webrtc-deskshare' into merge-webrtc-screenshare-1 2016-08-04 15:17:46 +00:00
Ghazi Triki
984717e195 Minor logging improvement into BigBlueButtonActor.scala 2016-08-02 17:14:42 +01:00
Anton Georgiev
2ae55432fd deskshare transition to webrtc screenshare changes 2016-07-29 16:16:55 +00:00
perroned
8c7fdc0036 Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-client/resources/prod/lib/verto_extension.js
 2016-07-27 19:32:01 +00:00
Ghazi Triki
2638e6c9c1 Merge branch 'master' into breakout-rooms-recording 
# Conflicts:
#	akka-bbb-apps/src/main/resources/application.conf
 2016-07-26 17:27:50 +01:00
Ghazi Triki
a62db6c8b4 Breakout rooms uses password from the parent room. 2016-07-25 23:20:31 +01:00
Ghazi Triki
7d2cef9b9f Added recording options for breakout rooms. 2016-07-25 22:31:04 +01:00
Fred Dixon
7a75773680 Removed Windows line feeds from application.conf 2016-07-24 23:56:26 -04:00
Anton Georgiev
a4d173c1a4 fix missing lib for video-broadcast 2016-07-22 15:54:03 +00:00
Anton Georgiev
01e0c99c58 subscribe for -DESKSHARE in meeting, adjust for liveMeeting 2016-07-20 21:39:36 +00:00
Richard Alam
7882735076 Record breakout rooms 
If the parent meeting is recorded, record also the breakout rooms.
 2016-07-18 17:07:31 +00:00
Richard Alam
f66571e899 Fixes issue 3196 
End the breakout rooms when the parent meeting is ended from the API.
 2016-07-15 20:03:24 +00:00
Pedro Beschorner Marin
85e68a66ca Merge remote-tracking branch 'origin/inactivity-timeout' into merging-to-1.0 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
 2016-06-27 19:57:48 +00:00
Pedro Beschorner Marin
78313fda46 Merge remote-tracking branch 'rafael/feature-1944' into rafafp-branches-merged-1.0 2016-06-22 14:23:59 +00:00
Pedro Beschorner Marin
4c432ee5bd Merge branch 'feature-1931' into rafafp-branches-merged-1.0 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatToolbar.mxml
	record-and-playback/presentation/scripts/publish/presentation.rb
 2016-06-22 13:06:51 +00:00
Pedro Beschorner Marin
e12af55dc8 Merge remote-tracking branch 'rafael/fix-1969' into rafafp-branches-merged-1.0 2016-06-21 14:14:00 +00:00
Pedro Beschorner Marin
7aed9ac32a Merge remote-tracking branch 'origin/akka-logging-actors-exceptions' into merging-to-1.0 2016-06-20 17:09:16 +00:00
Anton Georgiev
a8e39edf15 allow reply for zero meetings too 2016-06-14 14:11:43 +00:00
Anton Georgiev
7fb2184c02 fix querry for existing meetings 2016-06-13 21:39:31 +00:00
Anton Georgiev
abe4ade1ca rework summary dispatcher for html5 client; add caption history 2016-06-02 20:26:32 +00:00
Anton Georgiev
1854855218 adjust captions and deskshare to use eventBus in akka apps 2016-06-02 16:06:01 +00:00
Richard Alam
f2819a6282 Setup application config 
Need to tell service location of application config.
 2016-05-30 14:11:32 -04:00
Anton Georgiev
dd075faa2e config updates 2016-05-27 14:30:16 -04:00
Richard Alam
aafc420d53 Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into merge-bbb-1.1-dev-java8-with-master 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-05-24 20:17:47 +00:00
Richard Alam
58c239bc43 Merge branch 'master' into merge-bbb-1.1-dev-java8-with-master 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/resources/application.conf
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/RecorderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala
	akka-bbb-fsesl/build.sbt
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/pubsub/receivers/RedisMessageReceiver.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/build.xml
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-web/build.gradle
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Meeting.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	record-and-playback/core/scripts/bigbluebutton.yml
 2016-05-16 11:35:36 -04:00
Richard Alam
7ae9b7b204 Merge branch 'merge-webrtc-ds' of https://github.com/antobinary/bigbluebutton into antobinary-merge-webrtc-ds 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-fsesl/build.sbt
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java
	akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-05-20 20:27:52 +00:00
Anton Georgiev
228dfb4061 Merge branch 'mod-verto-1' of github.com:antobinary/bigbluebutton into merge-webrtc-ds 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/resources/application.conf
	akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bbb-fsesl-client/build.sbt
	bbb-fsesl-client/src/main/java/org/freeswitch/esl/client/inbound/Client.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-client/build.xml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/BrowserCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-html5/app/client/NotificationControl.coffee
	bigbluebutton-html5/app/client/globals.coffee
	bigbluebutton-html5/app/client/lib/bbb_api_bridge.coffee
	bigbluebutton-html5/app/client/main.coffee
	bigbluebutton-html5/app/client/main.html
	bigbluebutton-html5/app/client/stylesheets/whiteboard.less
	bigbluebutton-html5/app/client/views/chat/chat_bar.coffee
	bigbluebutton-html5/app/client/views/modals/settings.coffee
	bigbluebutton-html5/app/client/views/modals/settings.html
	bigbluebutton-html5/app/client/views/users/user_item.coffee
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
	bigbluebutton-html5/app/collections/collections.coffee
	bigbluebutton-html5/app/config.coffee
	bigbluebutton-html5/app/lib/router.coffee
	bigbluebutton-html5/app/server/collection_methods/meetings.coffee
	bigbluebutton-html5/app/server/collection_methods/users.coffee
	bigbluebutton-html5/app/server/publish.coffee
	bigbluebutton-html5/app/server/server.coffee
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	record-and-playback/presentation/scripts/process/presentation.rb
	record-and-playback/presentation/scripts/publish/presentation.rb
 2016-05-18 15:14:04 +00:00
David Feng
67c14f9056 This enable avatar to be display in other participants video window 2016-04-20 14:08:13 +08:00
RafaFP
6a93432709 implemented a button to give moderators the option to end the meeting when they logout 
refs #1944
 2016-03-29 20:55:23 +00:00
Richard Alam
a684aa4dfc Merge into bbb-1.1.dev 
Merge master, breakout rooms, and closed captioning into bbb-1.1-dev branch.

Conflicts:
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
 2016-03-21 18:12:30 +00:00
Richard Alam
7fe44355d4 Merging breakout rooms with the master branch 
Merge breakout rooms feature with master branch. This
 also includes closed captioning feature.

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-web/.classpath
	bigbluebutton-web/.settings/org.eclipse.jdt.core.prefs
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-03-21 17:52:23 +00:00
Ghaz Triki
8edeb609db Send externalUserId instead of the internal user id to the main room. 2016-03-17 17:07:37 +01:00
Ghaz Triki
af07b8508b Make the breakout room user id composer from its original user id and the breakout room number. 2016-03-17 15:01:17 +01:00
Ghaz Triki
07d3028d10 Fetch all breakout rooms users and decorate BreakoutRoom class to display their the number of a breakout room users. 2016-03-16 19:12:10 +01:00
Ghaz Triki
6a559b05ec Merge branch 'master' into breakout-rooms-porto-algre-2015 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2016-03-16 14:27:41 +01:00
Felipe Cecagno
c818cd154b Merge remote-tracking branch 'bigbluebutton/master' into mconf 2016-03-09 12:05:32 -03:00
Pedro Beschorner Marin
6fd5e289eb Fixed empty sharednotes when connecting problem. Now patches are identified and buffered when client is connecting. 2016-03-08 20:31:42 +00:00
Pedro Beschorner Marin
64c186ae85 Changed monitor's overdue logic and implemented new messages for the client 2016-03-07 20:09:43 +00:00
Richard Alam
ef2470f33b Process JSON message from Redis on another thread 
Process converting of message from json on a different thread to protect the redis sub actor from
 dying when exception occurs due to invalid message.
 2016-03-07 16:42:40 +00:00
Felipe Cecagno
c2b139219b add externUserId to the ParticipantJoin event (exported to events.xml) 2016-03-04 20:23:20 -03:00
Pedro Beschorner Marin
7e0da6999c Cleanup 2016-03-04 21:08:15 +00:00
Pedro Beschorner Marin
b891be2e95 Client now react to warning messages and refactored server 2016-03-04 20:45:56 +00:00
RafaFP
89ac2fd60a Improved the code to meet the peer review results. 
refs #1931
 2016-03-04 17:40:48 +00:00
Pedro Beschorner Marin
225fbbb483 Meeting's inactivity detection. Still needs some refactoring and cleanup. 2016-03-03 20:30:56 +00:00
RafaFP
932de9c07f Updated class and method names to better correspond to the implemented function. 
Improved the recording code.

refs #1931
 2016-03-02 16:02:30 +00:00
Felipe Cecagno
e4da408c08 Merge branch 'mconf' into bigbluebutton/bigbluebutton@master 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationService.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/ParamsProcessorUtil.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingServiceHelper.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Recording.java
	bigbluebutton-web/web-app/WEB-INF/freemarker/get-recordings.ftl
	record-and-playback/presentation/playback/presentation/0.9.0/playback.html
	record-and-playback/presentation/scripts/publish/presentation.rb
 2016-03-02 01:19:09 -03:00
Ghaz Triki
990e786340 Merge branch 'master' into breakout-rooms-porto-algre-2015 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
#	bigbluebutton-web/.classpath
#	bigbluebutton-web/.settings/org.eclipse.jdt.core.prefs
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
#	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-02-28 21:34:33 +01:00
RafaFP
32f937def8 Implemented the clearing of text in the recordings player. 
Recordings will now clear the chat box for every clear command received during the recording.

refs #1931
 2016-02-26 21:18:14 +00:00
Ghaz Triki
93140364f9 Display breakout room timer in the parent room. 2016-02-23 17:47:25 +01:00
Ghaz Triki
9adc9c626c End all breakout rooms whenever the parent room is programatically ended. 2016-02-23 11:10:34 +01:00
RafaFP
65b181198c Implemented a button to clear chat history. 
New conversation joiners will not receive the history previous to the clearing.
Current conversation users will clear the local chat history and be notified that a moderator cleared the chat.

refs #1931
 2016-02-22 22:10:04 +00:00
Anton Georgiev
107fa7c07a fix for #3012 no presenter after ex-presenter kicked 2016-02-19 16:52:56 +00:00
Ghazi Triki
78af9a5030 Remaining time for the breakout room is calculated in seconds instead of minutes. 2016-02-10 15:23:44 +01:00
Ghazi Triki
da81a1bd72 Only display the number of users in breakout rooms list. 2016-02-08 21:03:35 +01:00
Richard Alam
9fac3d43db - merge latest form ghazi 2016-02-08 18:08:49 +00:00
Richard Alam
5f03fd5f0b Merge branch 'breakout-rooms-porto-algre-2015' of https://github.com/riadvice/bigbluebutton into breakout-rooms-porto-algre-2015 2016-02-08 16:25:56 +00:00
Ghazi Triki
492315e0a7 Added log info to BreakoutRoomApp when EndAllBreakoutRooms message is received. 2016-02-05 17:30:21 +01:00
Ghazi Triki
2fb347bc25 Refactored the way that conference transfer between the parent room and breakout room is requested. 2016-02-03 22:30:08 +01:00
Pedro Beschorner Marin
e9cc024e5e Added exception handlers to deskshare actors and refactored the akka ones 2016-02-03 18:41:49 +00:00
Ghazi Triki
cf117282a7 BigBlueButtonActor is now responsible for informing the parent room that one if its children has been terminated. 2016-02-02 20:28:43 +01:00
Richard Alam
21b8c703a5 Merge branch 'breakout-rooms-porto-algre-2015' of https://github.com/riadvice/bigbluebutton into breakout-rooms-porto-algre-2015 
Conflicts:
	akka-bbb-apps/scala/JsonTest.sc
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/Protocol.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/MeetingMessageToJsonConverter.scala
 2016-02-01 16:12:06 +00:00
Anton Georgiev
21f2d7a788 limit -DESKSHARE to fsesl only, not akka-bbb-apps 2016-01-29 20:52:14 +00:00
Pedro Beschorner Marin
d74c571958 Akka actors now print and log the exceptions and are kept alive 2016-01-28 18:15:24 +00:00
Anton Georgiev
1d4caa0195 get timestamp as per convention 2016-01-27 22:26:28 +00:00
Anton Georgiev
08d6ee36f9 recover videoWidth, videoHeight params 2016-01-27 21:42:10 +00:00
Ghazi Triki
16bd601735 Use ListenInOnBreakout event from client instead of TransferUserToMeeting. 2016-01-27 22:25:15 +01:00
Ghazi Triki
0385d05001 Merge branch 'master' into breakout-rooms-porto-algre-2015 
# Conflicts:
#	akka-bbb-apps/build.sbt
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
#	akka-bbb-fsesl/build.sbt
#	bbb-common-message/build.sbt
#	bigbluebutton-apps/build.gradle
#	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
 2016-01-27 14:16:05 +01:00
Ghazi Triki
9b66cf30f9 Added transfer user from the parent voice conference to a selected breakout voice conference. 2016-01-27 12:00:32 +01:00
Felipe Cecagno
2a3b95daf7 Merge remote-tracking branch 'bigbluebutton/master' into mconf 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
	bbb-video/src/main/webapp/WEB-INF/bigbluebutton-video.properties
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ConnectionFailedEvent.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/maps/FlashCallEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-config/bin/bbb-conf
 2016-01-26 18:33:31 -02:00
Anton Georgiev
7bedb7d6f7 missed some lines in recorderActor. also clean up 2016-01-26 20:23:50 +00:00
Anton Georgiev
0d9c2d1472 remove dependency on vh, vw. remove obsolete code. clean up 2016-01-26 18:53:26 +00:00
Ghazi Triki
a396063981 Breakout rooms are terminated from the main parent room. 2016-01-25 19:49:27 +01:00
Ghazi Triki
afcc925380 Added missing message EndBreakoutRoom 2016-01-25 16:59:06 +01:00
Ghazi Triki
4f30127003 Ending a breakout room message goes to to bbb-web to be handled then send the response back to the client trgouh akka-apps and bbb-apps. 2016-01-23 18:44:50 +01:00
Richard Alam
3273912bd1 Merge pull request #2968 from ritzalam/expire-redis-keys-after-14-days 
Expire redis keys after 14 days
 2016-01-22 14:29:25 -05:00
Pedro Beschorner Marin
8890f46910 - avoid scala warning messages 2016-01-22 19:00:50 +00:00
Pedro Beschorner Marin
086e339653 Simple modification to avoid multiple start audio recording events 2016-01-22 16:43:17 +00:00
Richard Alam
f501fb5803 - expire redis recording keys after 14 days 2016-01-21 20:43:28 +00:00
Richard Alam
6956ddf723 - do not record events if the meeting is not recorded 2016-01-21 20:42:47 +00:00
Ghazi Triki
1dd4ddd6cb Created breakout rooms are now displayed in breakout rooms list. 2016-01-21 20:09:32 +01:00
Richard Alam
c66c180040 - make the flash client not attempt to reconnect when the user has been ejected from the meeting. 2016-01-19 16:16:12 +00:00
Ghazi Triki
e4cc61ad4e Fixed users marshalling in UpdateBreakoutUsers message. 2016-01-15 22:16:38 +01:00
Ghazi Triki
058a2170ee Added request breakout rooms list feature. 2016-01-15 22:13:53 +01:00
Richard Alam
d79d763857 Merge branch 'reconnect-fixes' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-reconnect-fixes 2016-01-14 19:43:08 +00:00
Anton Georgiev
c28bbce889 add data and clean up 2016-01-13 22:54:03 +00:00
Ghazi Triki
cc56ee8b2f Joining a breakout room made possible throught the client. 2016-01-13 21:33:54 +01:00
Ghazi Triki
0581c5186d End all breakout rooms handled in akka-bbb-apps 2016-01-13 20:29:17 +01:00
Ghazi Triki
3f049ec644 Added more scala worksheet to test breakout room feature. 2016-01-13 18:20:51 +01:00
Pedro Beschorner Marin
afb1cc44d6 Fixed SIP mic reconnection 2016-01-13 15:01:04 +00:00
Pedro Beschorner Marin
28bf1c9084 Fixed global audio reconnection 2016-01-13 13:50:38 +00:00
Ghazi Triki
6ad3b315ee Implemented EndAllBreakoutRooms in akka-bbb-apps 2016-01-12 20:45:35 +01:00
Ghazi Triki
48844648ee Send RequestBreakoutJoinUrl from client to server. 2016-01-12 20:18:23 +01:00
Felipe Cecagno
d98bee07cf Merge webrtc-reconnect into bigbluebutton/master 
Conflicts:
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
 2016-01-12 15:27:01 -02:00
Anton Georgiev
b5fafe25ca Removing recording code used in the past for recording to file via FS. obsolete as we now record in red5 2016-01-08 21:58:10 +00:00
Anton Georgiev
9a0383f35a after ds destroy, clean params, notify others 2016-01-08 19:38:36 +00:00
Anton Georgiev
23a83ab6e9 destoy deskshare on FS if presenter leaves 2016-01-08 19:07:57 +00:00
Richard Alam
838d6e0ad7 - merge Chad's closed caption work into Ghazi's breakout rooms work 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
 2016-01-08 19:06:42 +00:00
Richard Alam
53e0c375e0 - fix merge issues 2016-01-08 15:56:19 +00:00
Richard Alam
747f820173 - try to fix merge issues 2016-01-07 23:15:35 +00:00
Richard Alam
16499b3da1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merge-master-into-ghazi 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	akka-bbb-fsesl/build.sbt
	bigbluebutton-web/build.gradle
 2016-01-07 22:58:04 +00:00
Chad Pilkey
311adeda42 added recording for the caption edit messages 2016-01-06 11:23:40 -08:00
Felipe Cecagno
8f08e13dcc Merge remote-tracking branch 'bigbluebutton/master' into mconf 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
 2015-12-30 18:35:13 -02:00
Anton Georgiev
155aebdc65 allow late joining ds for html5 client, event if Meteor started late 2015-12-22 22:55:16 +00:00
Anton Georgiev
8ee6356b5a accommodate late joiners 2015-12-22 16:21:39 +00:00
Anton Georgiev
5bf05161af Merge branch 'html5client-mod-verto-addition' of github.com:perroned/bigbluebutton into webrtc-desktop-temp-4 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
 2015-12-11 17:23:27 +00:00
Chad Pilkey
71f8ff085f first try and adding caption ownership 2015-12-09 14:00:26 -08:00
Pedro Beschorner Marin
438e5fc1e6 Fixed guest policy getting, setting an changed messages 2015-12-04 15:16:09 +00:00
Pedro Beschorner Marin
59cd4f64bf Refactored shared notes app 2015-12-03 17:44:17 +00:00
Pedro Beschorner Marin
20231003ae Fixed additional note creation 2015-12-03 16:19:24 +00:00
Richard Alam
0bba549b38 - sometimes we see multiple wav files on recorded meetings. This was due to starting recording again 
when the user gets disconnected from bbb-apps but still connected to audio.
 2015-12-02 23:03:44 +00:00
Richard Alam
c024cd570c - fix where 2 events are recorded in redis for each voice event. 2015-12-02 21:37:18 +00:00
Pedro Beschorner Marin
ee3864e5ce Fixed sharednotes MAIN_WINDOW 2015-12-02 18:39:35 +00:00
Pedro Beschorner Marin
e868fb3cc9 Fixed user role change 2015-12-01 14:45:44 +00:00
Felipe Cecagno
555e037d79 fix merge and refactor a few pieces to fit better on BigBlueButton 1.0.0 2015-11-30 01:06:38 -02:00
Pedro Beschorner Marin
36bbcc06d6 Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf-live0.7.3-merge 
Conflicts:
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/ConversionUpdatesProcessor.java
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-video/.classpath
	bbb-video/build.gradle
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bbb-video/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ConnectionInvokerService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationMessageListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/ParticipantsService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationApplication.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/Constants.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersModel.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/red5/UsersClientMessageSender.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersEventRedisPublisher.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersMessageToJsonConverter.scala
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/es_LA/bbbResources.properties
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/resources/prod/MconfLive.html
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/SharedNotesModule.mxml
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/core/managers/ReconnectionManager.as
	bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as
	bigbluebutton-client/src/org/bigbluebutton/core/services/BandwidthMonitor.as
	bigbluebutton-client/src/org/bigbluebutton/core/services/StreamMonitor.as
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/NetworkStatsData.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.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/model/users/events/ChangeMyRole.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ChangeRoleEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/LowerHandEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/StreamStoppedEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/LanguageSelector.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MuteMeButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/NetworkStatsWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/red5/Connection.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMapDelegate.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/WindowLayout.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/AddButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/ToolbarComponent.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/UploadedPresentationRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/Client.as
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/HTTPServerConnection.as
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/ServerConnection.as
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/XMLServerConnection.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersMainEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/GraphicsWrapper.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoDock.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
	bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as
	bigbluebutton-config/bigbluebutton-release
	bigbluebutton-config/bin/bbb-conf
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PresentationController.groovy
	bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisStorageService.java
	bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
 2015-11-25 15:58:36 +00:00
Chad Pilkey
0990c2c2ad Commiting with the caption module in a workable state 2015-11-24 15:19:39 -08:00
Chad Pilkey
3036a9740b caption module now tracks TextArea updates 2015-11-23 12:56:52 -08:00
Ghazi Triki
1bb3d4a197 MessageSenderActor handles BreakoutRoomStartedOutMessage, UpdateBreakoutUsersOutMessage and MeetingTimeRemainingUpdate and convert them to json. 2015-11-23 10:19:17 +01:00
Ghazi Triki
6e9b95e347 BreakoutRoomStarted event finally arrives to the client. 2015-11-20 19:06:11 -02:00
Ghazi Triki
924a8cbefd Added BreakoutRoomStartedOutMessage handler to MessageSenderActor 2015-11-20 15:26:34 -02:00
Richard Alam
06029aaba7 - figure out enums 2015-11-18 11:18:46 -05:00
Ghazi Triki
7989b897f3 Create breakout room and send the message to akka-bbb-apps 2015-11-19 16:54:06 -02:00
Ghazi Triki
5a6266e395 bbb-web sends back the breakout room created event to bbb-akka-apps 2015-11-19 12:33:00 -02:00
Ghazi Triki
a623443b16 Fixed breakout room default presentation URL 2015-11-19 12:32:37 -02:00
Ghazi Triki
b3dabfdf69 Fixed compile errors on akka-bbb-apps 2015-11-19 10:32:46 -02:00
Richard Alam
f7630bdc74 Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into breakout-rooms-porto-algre-2015 2015-11-17 14:33:57 -05:00
Ghazi Triki
b299e3fd50 Accept processing RequestBreakoutJoinURL message in akka-bbb-apps 2015-11-18 18:20:56 -02:00
Richard Alam
6a85afa430 - format out message 2015-11-17 14:33:15 -05:00
Richard Alam
6bcfbadf64 Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into breakout-rooms-porto-algre-2015 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
 2015-11-17 10:42:36 -05:00
Ghazi Triki
ef23cacefa Breakout room feature server updates. 2015-11-18 16:45:46 -02:00
Ghazi Triki
ce09a8d952 Minor fix for PresentationMessageListener when converting a presentation message. 2015-11-18 14:57:28 -02:00
Richard Alam
1e1ee72ac0 - try to encode out messages 2015-11-17 10:41:15 -05:00
Richard Alam
39d9c5dd15 Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into breakout-rooms-porto-algre-2015 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/BreakoutRoomService.java
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
 2015-11-17 02:19:48 -05:00
Ghazi Triki
69acc57f2d Breakout related requests are sent to the correct "meeting" redis channel. 2015-11-17 18:34:13 -02:00
Ghazi Triki
b8eafcc11c Better processing of CreateBreakoutRoomsRequest in akka-bbb-apps 2015-11-17 17:29:37 -02:00
Richard Alam
bd8b38a22c - use spray json to decode messages 2015-11-17 02:11:14 -05:00
Ghazi Triki
402f337fd6 Handle CreateBreakoutRoomsRequest case in BigBlueButtonInGW.scala 2015-11-16 17:09:38 -02:00
Chad Pilkey
2d9d28f638 added a new caption message to push current line 2015-11-03 15:44:26 -08:00
Richard Alam
83934862fc - tell parent meeting that breakout room has been created 2015-10-30 21:28:01 +00:00
Richard Alam
ea2dbd541a - breakout room incoming message 2015-10-30 21:08:13 +00:00
Richard Alam
923d78719b - send messages to redis 2015-10-30 19:14:35 +00:00
Richard Alam
48e5f5f638 - formatting cleanup 2015-10-29 21:43:49 +00:00
Richard Alam
27f6aa0cfb - implement message handler for breakout rooms 2015-10-29 18:21:38 +00:00
Richard Alam
c224e58d5b - move meeting actor methods into class so it is easier to setup tests 2015-10-28 20:54:31 +00:00
Richard Alam
4154d9e531 - write tests to calculate checksum 2015-10-28 17:05:40 +00:00
Richard Alam
e3fdea517a - increment meeting id 2015-10-28 15:12:35 +00:00
Richard Alam
66eaef9032 - implement create breakout room handler 2015-10-28 15:00:37 +00:00
Richard Alam
aa15bc220a - add tests 2015-10-27 15:31:14 +00:00
Richard Alam
00e6e2b4db - externalise scheduled timer 2015-10-26 20:45:00 +00:00
Richard Alam
7db6144921 - add tests 2015-10-26 19:00:04 +00:00
Richard Alam
968a2ed98f - rename event bus 2015-10-23 21:08:30 +00:00
Richard Alam
4a10f04f8b - use akka event bus for messages 2015-10-23 19:37:13 +00:00
Richard Alam
75e0b0065a - fix duration 2015-10-23 15:14:46 +00:00
Anton Georgiev
8e407df405 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-1 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bigbluebutton-apps/build.gradle
 2015-10-22 20:46:30 +00:00
Richard Alam
b899eeebcf - distinguish breakout rooms in create meeting request 2015-10-22 19:36:20 +00:00
Richard Alam
cecbc46d1d - create breakout room in bbb-web 2015-10-22 17:13:53 +00:00
Richard Alam
10f7f3f852 - play around with akka http 2015-10-20 15:43:41 +00:00
Richard Alam
acd021a113 - play around with akka http 2015-10-19 19:00:59 +00:00
Chad Pilkey
ad3ba6677c first two initial caption module messages finished 2015-10-15 15:40:23 -07:00
Anton Georgiev
f08cd5262e temp changes 2015-10-13 19:00:50 +00:00
Richard Alam
93dd5186b4 - user internal user id for user in the voice conf 2015-09-30 18:55:17 +00:00