Chad Pilkey
46e0253f17
Merge remote-tracking branch 'upstream/master' into implement-rights-management
2017-11-09 14:36:25 -05:00
Anton Georgiev
84df0dfdd4
Merge pull request #4646 from ritzalam/fix-chat-issues
...
Fix chat issues
2017-11-09 13:46:31 -02:00
Richard Alam
3673f563e4
- add focus on chat box todo list
2017-11-09 04:45:51 -08:00
Richard Alam
4acb15cb66
- remove box mapper on chat box closed event
2017-11-09 04:06:08 -08:00
Richard Alam
d684efe2f3
- do not open new chat box if already chatting with user
2017-11-08 19:43:05 -08:00
Chad Pilkey
d1ebaa249b
Merge remote-tracking branch 'upstream/master' into implement-rights-management
2017-11-08 19:47:50 -05:00
Chad Pilkey
c615d36cd8
fix two null exceptions in the Flash client
2017-11-08 18:49:25 -05: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
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
Richard Alam
60d030d436
- track chat box closing
2017-11-07 04:31:01 -08: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
a6b5311f04
- add comment to open private chats in main public chat window
2017-11-05 16:02:39 -08:00
Richard Alam
fb5723af1e
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into fix-chat-issues
2017-11-05 15:46:06 -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
8e350724f4
- cleanup
2017-11-03 14:58:00 -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
411307af3f
handle zoom and move event in presentation pods
2017-11-03 15:35:59 -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
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
f1d3f31f3f
reuse DEFAULT_PRESENTATION_POD as a const
2017-11-02 16:54:42 -04:00
Richard Alam
4e8f2abbb3
- pass token on video connect
2017-11-01 14:55:48 -07: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
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
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
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
Chad Pilkey
052eed88d0
allow loading SWFs from a CDN
2017-10-30 17:28:32 -04:00
Richard Alam
0036b5734d
- create guest lobby html page
2017-10-30 14:21:09 -07:00
Anton Georgiev
8a87b9d6d2
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pods_vol4
2017-10-30 16:06:47 -04:00
