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

604 Commits

Author SHA1 Message Date
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
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