Commit Graph

19077 Commits

Author SHA1 Message Date
Anton Georgiev
3dc6c183d6
Merge pull request #4644 from antobinary/guest-work
Guest Management - handle individual guests approv vs deny (client side improvements)
2017-11-09 13:09:49 -02:00
Anton Georgiev
eb3f8aec5b close PendingGuestsWindow only from parent 2017-11-08 18:41:51 -05:00
Anton Georgiev
0d915a0c56 handle PendingGuestWindow when there are 1+ guests waiting 2017-11-08 18:10:24 -05:00
Anton Georgiev
a277a79aeb Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into guest-work 2017-11-08 14:46:50 -05:00
Fred Dixon
113368914a
Merge pull request #4639 from kepstin/segmented-recording
Segmented recording (archive & sanity support)
2017-11-08 08:11:37 -05:00
Anton Georgiev
af578111bc
Merge pull request #4632 from ritzalam/guest-manager-remember
- set guest policy when remember choice is checked
2017-11-07 19:05:54 -02:00
Anton Georgiev
1d38e9498a Merge branch 'guest-manager-remember' of github.com:ritzalam/bigbluebutton into guest-work 2017-11-07 10:21:07 -05:00
Calvin Walton
4e243536c7 Handle the no audio files case a bit better
If no audio files were found, it was running rsync with one argument,
which is a bit unexpected. It just printed a file list in this case, but
we can provide a cleaner error message instead.
2017-11-07 10:03:20 -05:00
Calvin Walton
50f2c1b90b Fix syntax issues in sanity scripts 2017-11-07 09:53:08 -05:00
Calvin Walton
35f7f425e2 Fix break detection in events 2017-11-07 09:52:50 -05:00
Chad Pilkey
94433535da
Merge pull request #4633 from riadvice/logout-improve
Make logout happen when using a wrong session token
2017-11-06 17:41:34 -05:00
Chad Pilkey
4e5354df94
Merge pull request #4634 from riadvice/external-swf-modules
Added documentation to explain how to use a CDN with the Flex client
2017-11-06 17:35:12 -05:00
Calvin Walton
9add60d81b Fix a bunch of bugs found when testing the archive code 2017-11-06 15:22:43 -05:00
Ghazi Triki
bf87a2325a Added documentation to explain how to use a CDN with the Flex client. 2017-11-06 15:57:14 +01:00
Ghazi Triki
ca1fad923e Make logout happen when using a wrong session token. 2017-11-06 15:26:17 +01:00
Richard Alam
42b96e370d - propagate guest policy change to bbb-web 2017-11-05 20:21:42 -08:00
Richard Alam
a9f160ce99 - set guest policy when remember choice is checked 2017-11-05 16:49:10 -08:00
Richard Alam
4196e4e8ce Merge branch 'riadvice-external-swf-modules' 2017-11-05 15:43:34 -08:00
Richard Alam
54d5eb1101 Merge branch 'external-swf-modules' of https://github.com/riadvice/bigbluebutton into riadvice-external-swf-modules 2017-11-05 13:53:18 -08:00
Ghazi Triki
fc9eab9992 Correctly load MainToolbar configuration. 2017-11-05 16:05:53 +01:00
Ghazi Triki
da3a604d2a Compile the master locale within the main application to avoid loading it when the application is launched, in that case we only load the preferred locale if needed. 2017-11-05 15:36:02 +01:00
Ghazi Triki
356dcf277e Move all logout and close events handlers from MainApplicationShell to new LogoutManager. 2017-11-05 10:15:25 +01:00
Richard Alam
50df25e06a Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2017-11-03 17:38:47 -07:00
Anton Georgiev
7d10ac1a98
Merge pull request #4630 from antobinary/pods_vol4
Presentation Pods - handle zoom, move and remove; cleanup
2017-11-03 18:29:11 -02:00
Anton Georgiev
9cd8491d70 pass podId when removing/clearing presentation 2017-11-03 16:24:55 -04:00
Anton Georgiev
3ed0fc2a55 cleanup 2017-11-03 16:22:26 -04:00
Calvin Walton
5bb5cbcd0e Have archive script check whether a particular segment is recorded
It previously checked whether any part of the entire meeting was recorded.
Helper functions are added to look up the time of segment start and end
(which handle non-segmented recordings correctly too).
Part of the events handling code was rewritten to reduce the number of times
that the events.xml file gets parsed.
2017-11-03 16:12:05 -04:00
Anton Georgiev
411307af3f handle zoom and move event in presentation pods 2017-11-03 15:35:59 -04:00
Calvin Walton
f9c4843f28 Cleanups, initial work on checking for segment recorded status. 2017-11-03 15:17:04 -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
Anton Georgiev
2b1d88a358
Merge pull request #4628 from antobinary/pods_vol4
Presentation Pods - handle polling (only on default presentation pod)
2017-11-03 15:09:58 -02:00
Chad Pilkey
04f268a259
Merge pull request #4627 from capilkey/drop-mic-on-call-end
Release the saved WebRTC microphone when call ends
2017-11-03 12:49:17 -04:00
Chad Pilkey
22c160008e attempt to release mic when not needed for webrtc 2017-11-03 12:47:26 -04:00
Calvin Walton
0e2785205a Update sanity script for recording segments, fix archive done files 2017-11-03 12:02:36 -04: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
Anton Georgiev
e5b335b7b5 show poll related buttons only on the default pres pod 2017-11-03 11:32:57 -04:00
Calvin Walton
037014db94 Adjust sanity rap worker to support segment breaks 2017-11-03 11:27:00 -04:00
Ghazi Triki
7b99ac1f06 Improve origin URL setting by adding it to flashvars instead of of calling js from flash client. 2017-11-03 16:19:57 +01:00
Calvin Walton
f5cd1628e0 Trim events list after archive, make archive fail block future segments 2017-11-03 11:16:44 -04:00
Anton Georgiev
a3d91b9ddb adjust permissions for RemovePresentationPodPubMsg 2017-11-03 10:57:46 -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
Anton Georgiev
6ce6b73e6a Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pods_vol4 2017-11-03 10:08:10 -04:00
Ghazi Triki
e1e162b38f Take into consideration more CDN assets for the Flex client:
- Added new option `localesDirectory` to language tag.
- Added `localesConfig` to language tag, removed domain guessing and make `locale.xml` external.
- Change the application initialisation order: load config.xml, then locale, then add MainApplicationShell to BigBlueButtonMainContainer if all is correctly processed.
- Added a new event LocaleChangeEvent.LOCALE_INIT.
- Added `videoProfilesConfig` property to VideoconfModule configuration.
- Fix skin name condition in SkinningService.
- Added new Options class: LayoutModuleOptions.
2017-11-03 10:43:15 +01: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
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