BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,221 Commits 13 Branches 260 Tags 1.1 GiB
06b5538054
Commit Graph

578 Commits

Author SHA1 Message Date
Richard Alam
10c4846b92 - provide a way to filter messages we want to record 2017-07-21 20:25:41 -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