Commit Graph

19030 Commits

Author SHA1 Message Date
Calvin Walton
0e2785205a Update sanity script for recording segments, fix archive done files 2017-11-03 12:02:36 -04:00
Calvin Walton
037014db94 Adjust sanity rap worker to support segment breaks 2017-11-03 11:27:00 -04:00
Calvin Walton
f5cd1628e0 Trim events list after archive, make archive fail block future segments 2017-11-03 11:16:44 -04:00
Calvin Walton
0b042bb292 Merge branch 'segmented-recording' of github.com:kepstin/bigbluebutton into segmented-recording 2017-11-03 10:51:56 -04:00
Calvin Walton
f9692740f7 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into segmented-recording 2017-11-03 10:50:11 -04:00
Calvin Walton
2c4cadf459 Delete event data from redis after archive writes xml
Todo: we also need to remove the events from the meeting event list
2017-11-03 10:27:52 -04:00
Richard Alam
bdd825ee97
Merge pull request #4626 from ritzalam/appply-permissions-on-messages
Appply permissions on messages
2017-11-02 17:12:24 -04:00
Richard Alam
1c5c387456 - add all moderators to presenter group 2017-11-02 14:08:38 -07:00
Richard Alam
4d44f09c84 - add permissions check on a few messages 2017-11-02 13:16:44 -07:00
Richard Alam
943af59e6f
Merge pull request #4625 from ritzalam/check-auth-token-on-video-connect
Check auth token on video connect
2017-11-02 13:43:01 -04: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
0e8ec5f3b4
Merge pull request #4622 from ritzalam/screenshare-chapter-breaks
Screenshare chapter breaks
2017-11-01 16:04:30 -04:00
Richard Alam
f9b4209d74 - make chapter break length configurable 2017-11-01 12:23:03 -07:00
Richard Alam
e71ac6bf0d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into screenshare-chapter-breaks 2017-11-01 12:12:58 -07:00
Richard Alam
4e9185b68f - add support for chapter break recording for screenshare 2017-11-01 12:12:14 -07:00
Anton Georgiev
548b63ecb9
Merge pull request #4620 from antobinary/pods_vol4
Presentation Pods - independent cursor control. Fully separate presenter assign control
2017-11-01 15:24:58 -02:00
Calvin Walton
a78997d1a1 Work in progress on segment archiving 2017-11-01 12:31:07 -04:00
Anton Georgiev
d6a7e04715 avoid null items in presenter pod dropdown 2017-11-01 11:18:57 -04: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
81d643bcde handle pod presenter change on whiteboard toolbar and text toolbar 2017-11-01 07:05:20 -04:00
Anton Georgiev
28f1809a70 independent control of presenter for modules Present and Whiteboard 2017-10-31 18:49:25 -04:00
Richard Alam
c01d22096e
Merge pull request #4619 from ritzalam/synch-with-v2.0
Synch with v2.0.x
2017-10-31 18:05:10 -04:00
Richard Alam
72a1745c65 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0 2017-10-31 14:58:36 -07:00
Richard Alam
c7ba367a39
Merge pull request #4617 from ritzalam/implement-multi-chat
- open guest window when new guest joins
2017-10-31 17:42:46 -04:00
Richard Alam
9ef812707c - open guest window when new guest joins 2017-10-31 14:31:12 -07:00
Anton Georgiev
8450921362 separate cursor events depending on whiteboardId (pod) 2017-10-31 15:55:59 -04:00
Richard Alam
e665f2ac6e
Merge pull request #4616 from ritzalam/implement-multi-chat
- setup polling of guest while waiting for approval from moderator
2017-10-31 15:55:21 -04:00
Richard Alam
3056622283 - setup polling of guest while waiting for approval from moderator 2017-10-31 12:50:54 -07:00
Chad Pilkey
383893c517
Merge pull request #4611 from capilkey/implement-rights-management
Add some of the rights management checks
2017-10-31 13:46:26 -04:00
Chad Pilkey
db44e24b9d
Merge pull request #4609 from capilkey/load-swf-cdn
Allow loading SWFs from a CDN
2017-10-31 13:46:07 -04:00
Anton Georgiev
0b7424d147
Merge pull request #4615 from antobinary/pods_vol4
Presentation Pods -  Handle default presentation pod missing ownerId
2017-10-31 15:42:08 -02:00
Anton Georgiev
8853d562ce
Merge pull request #4497 from Gcampes/audio-refactor
[HTML5] Refactor Audio
2017-10-31 15:39:37 -02:00
Gabriel Carvalho de Campes
2cca0c1724 change device selector key generation 2017-10-31 15:34:06 -02: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
Gabriel Carvalho de Campes
fde5d56d87 change ask permissions timing, small code fixes 2017-10-31 08:53:06 -02:00
Chad Pilkey
ebcf7dc4cc added some of the rights management checks 2017-10-30 23:21:02 -04:00
Richard Alam
376b42d58f
Merge pull request #4610 from ritzalam/sign-new-jars
Signing new jars
2017-10-30 23:14:27 -04:00
Richard Alam
116d8793cf - new signed jars expiring on 2019-5-22 2017-10-30 20:11:46 -07:00
Chad Pilkey
052eed88d0 allow loading SWFs from a CDN 2017-10-30 17:28:32 -04:00
Richard Alam
6eb7e4e83e
Merge pull request #4608 from ritzalam/implement-multi-chat
create guest lobby html page
2017-10-30 17:28:19 -04:00
Richard Alam
0036b5734d - create guest lobby html page 2017-10-30 14:21:09 -07:00
Richard Alam
332670c0b1
Merge pull request #4607 from ritzalam/implement-multi-chat
Setup presentation window for pre-uploaded presentation
2017-10-30 16:14:21 -04:00
Anton Georgiev
8a87b9d6d2 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pods_vol4 2017-10-30 16:06:47 -04:00
Richard Alam
9f28f240a5 - hardcode default presentation window for pre-uploaded presentations and for creation of breakout rooms 2017-10-30 13:05:06 -07:00
Anton Georgiev
fcdb479581 Handle default presentation pod missing ownerId
request new pod from client side, and when handling it, just populate the ownerId of the existing pod
2017-10-30 16:04:43 -04:00
Richard Alam
38ade4d7ec
Merge pull request #4605 from ritzalam/implement-multi-chat
Rights management and layout id
2017-10-30 15:36:19 -04:00