Commit Graph

19646 Commits

Author SHA1 Message Date
Richard Alam
4c6b953abc - split authenticated guests from regular guests 2017-12-08 13:21:22 -08:00
Richard Alam
2574a18e7f Merge branch 'synch-with-v2.0' into guest-and-authenticated-guest 2017-12-08 12:04:56 -08:00
Richard Alam
b74a57aaaf Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into guest-and-authenticated-guest 2017-12-08 11:32:46 -08:00
Richard Alam
715a0177fd Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0 2017-12-08 11:26:09 -08:00
Anton Georgiev
96f773b954
Merge pull request #4751 from Tainan404/fix-userlist-bug
Fix false click in userlist.
2017-12-08 16:51:40 -02:00
Anton Georgiev
129f6a221a
Merge pull request #4769 from OZhurbenko/presenter-functionality-2x
Fixed Text Shape for the desktop FF 57 and 58, disabled spellCheck
2017-12-08 16:51:13 -02:00
Richard Alam
5a155e5c09 Merge branch 'riadvice-file-download-update' 2017-12-08 08:48:40 -08:00
Anton Georgiev
085eb57556 add ejectUserFromVoice for moderator 2017-12-08 11:40:52 -05:00
Richard Alam
76b608fcda Merge branch 'file-download-update' of https://github.com/riadvice/bigbluebutton into riadvice-file-download-update 2017-12-08 08:36:51 -08:00
Richard Alam
21c0b479ae Merge branch 'ritzalam-check-guest-status' 2017-12-08 08:36:00 -08:00
Richard Alam
2acff2ce45 Merge branch 'check-guest-status' of https://github.com/ritzalam/bigbluebutton into ritzalam-check-guest-status 2017-12-08 08:30:33 -08:00
Richard Alam
f1e7e7021e
Merge pull request #4781 from capilkey/check-chat-message-parse-fail
Check for failed chat message parse
2017-12-08 11:26:35 -05:00
Richard Alam
3c90c4b7c4
Merge pull request #4761 from capilkey/fix-webcam-shortcut-lock
Block webcam popup opening when locked
2017-12-08 11:26:03 -05:00
Richard Alam
6bd2440cbf
Merge pull request #4760 from capilkey/chrome-microphone-access-warning
Add a warning about microphone access for chrome on HTTP
2017-12-08 11:25:28 -05:00
Richard Alam
89e8c669f3
Merge pull request #4754 from antobinary/join-via-html5-over-flash
Provide option to join via html5 over flash client
2017-12-08 11:24:50 -05:00
Joao Siebel
bf058959eb Remove log and add delay between hover/focus and showing the tooltip 2017-12-08 11:45:25 -02:00
Fred Dixon
dd91b2b78a
Merge pull request #4780 from capilkey/2.0-block-zoom-slider-change
(2.0 only) block zoom slider change processing when not presenter
2017-12-08 08:38:31 -05:00
Ghazi Triki
5e47e47e7f Fix presentation download. 2017-12-08 11:49:45 +01:00
Anton Georgiev
48bf163559 linting and clean-up 2017-12-07 17:13:44 -05:00
Anton Georgiev
a1a64a1524 Protect dial-in users from web user actions
disallow { promote / demote / make presenter / clear status } being triggered on a dial in user
2017-12-07 17:07:02 -05:00
Anton Georgiev
9f1a80078c handle join and leave of call-in user 2017-12-07 15:50:50 -05:00
Anton Georgiev
bf7c26f02b
Merge pull request #4712 from Tainan404/localize-public-clear
Localize message from when clear the chat.
2017-12-07 18:27:55 -02:00
Ghazi Triki
dac267d2e9 Export poll result as bitmap into PDF. 2017-12-07 21:21:45 +01:00
Chad Pilkey
6b2fc25084 check for failed chat message parse 2017-12-07 12:12:48 -08:00
Richard Alam
68e452df6c - add guest and authenticated info in client so we can display them separately 2017-12-07 10:47:07 -08:00
Chad Pilkey
d5793f86c2 (2.0 only) block zoom slider change processing when not presenter 2017-12-07 10:00:33 -08:00
Richard Alam
52db8f7925
Merge pull request #4776 from capilkey/add-poll-record-events
Add poll record events, remove unused HidePoll message
2017-12-07 11:21:05 -05:00
Joao Siebel
b03efc021c Remove unused package and fix whiteboard toolbar submenu tooltip 2017-12-07 14:11:34 -02:00
Chad Pilkey
4ce4204536 added poll record events, removed unused HidePoll message 2017-12-07 07:58:42 -08:00
Richard Alam
ed2892d076 - check if client has validated before letting server side messages pass through to client 2017-12-07 06:57:10 -08:00
Richard Alam
f5e6cc4046 - use header userId to validate token 2017-12-06 18:15:28 -08:00
Richard Alam
5a45dce81b
Merge pull request #4775 from ritzalam/check-guest-status
- check guest status when validating auth token
2017-12-06 21:14:44 -05:00
Richard Alam
e227d59a47
Merge pull request #4774 from capilkey/block-slider-change-event
Updates to the PresentationWindow to fix bugs
2017-12-06 21:14:29 -05:00
Chad Pilkey
4db637ffe1 re-order PresentationWindow instantiation so it can start up correctly 2017-12-06 21:10:55 -05:00
Richard Alam
7c4435b0bb - check guest status when validating auth token 2017-12-06 17:50:53 -08:00
Chad Pilkey
5e2969f488 increase the number of shown rows in presentation pod dropdown 2017-12-06 20:07:28 -05:00
Chad Pilkey
0159dd39dc block slider change event handling when not presenter 2017-12-06 19:09:08 -05:00
Richard Alam
5d4b1b21cc Merge branch 'riadvice-pod-number-in-title' 2017-12-06 14:34:45 -08:00
Oleksandr Zhurbenko
33c190790c Fixed Android detection for the text shape 2017-12-06 12:00:18 -08:00
Ghazi Triki
351d18a988 Prefix each presentation pod title with its sequence number. 2017-12-06 20:38:08 +01:00
KDSBrowne
53b6f8c71c remove focus when ESC key pressed 2017-12-06 09:05:32 -08:00
KDSBrowne
7631359bd1 Merge remote-tracking branch 'upstream/v2.0.x-release' into z14-fix-userlist-keyboard-accessibility 2017-12-06 08:57:28 -08:00
KDSBrowne
9606b5aa10 add prop validation 2017-12-06 08:53:16 -08:00
KDSBrowne
61de88d8d0 clean up code 2017-12-06 08:36:29 -08:00
KDSBrowne
089b3c5b56 make userlist accessibility work via props/state 2017-12-06 08:34:23 -08:00
Richard Alam
465bb6dd5f Merge branch 'riadvice-ui-fixes' 2017-12-05 17:46:19 -08:00
Richard Alam
c07e53fb90 Merge branch 'ui-fixes' of https://github.com/riadvice/bigbluebutton into riadvice-ui-fixes 2017-12-05 17:43:29 -08:00
Richard Alam
312590307a Merge branch 'ritzalam-show-auth-users' 2017-12-05 17:42:11 -08:00
Richard Alam
17202ad1df Merge branch 'show-auth-users' of https://github.com/ritzalam/bigbluebutton into ritzalam-show-auth-users 2017-12-05 17:33:36 -08:00
Richard Alam
3f64dad160 Merge branch 'riadvice-code-cleanup' 2017-12-05 17:32:16 -08:00