Commit Graph

19056 Commits

Author SHA1 Message Date
Anton Georgiev
1d38e9498a Merge branch 'guest-manager-remember' of github.com:ritzalam/bigbluebutton into guest-work 2017-11-07 10:21:07 -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
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
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
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
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
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
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
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
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
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
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