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 |
|
Richard Alam
|
5a155e5c09
|
Merge branch 'riadvice-file-download-update'
|
2017-12-08 08:48:40 -08: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 |
|
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
|
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 |
|
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 |
|
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 |
|
Ghazi Triki
|
351d18a988
|
Prefix each presentation pod title with its sequence number.
|
2017-12-06 20:38:08 +01: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 |
|
Richard Alam
|
a00942d077
|
Merge branch 'code-cleanup' of https://github.com/riadvice/bigbluebutton into riadvice-code-cleanup
|
2017-12-05 17:24:18 -08:00 |
|
Richard Alam
|
4c8e3f3589
|
Merge branch 'capilkey-cleanup-akka-apps'
|
2017-12-05 17:15:05 -08:00 |
|
Richard Alam
|
93f5dec98c
|
- remove duplicate message entry
|
2017-12-05 17:14:22 -08:00 |
|
Richard Alam
|
3f7b7d1544
|
- show list of authenticated and guest users waiting for approval
|
2017-12-05 17:00:21 -08:00 |
|
Anton Georgiev
|
c9a5ded2c1
|
Merge pull request #4662 from Tainan404/fix-design
Fix design issues
|
2017-12-05 18:54:08 -02:00 |
|
Chad Pilkey
|
174f24a184
|
block webcam popup opening when locked
|
2017-12-05 12:16:32 -08:00 |
|
Chad Pilkey
|
5c1a656f6d
|
add a microphone warning for chrome on http
|
2017-12-05 11:47:37 -08:00 |
|
Anton Georgiev
|
255d64d430
|
Merge pull request #4687 from Gcampes/audio-refactor-bugfixes
Audio bugfixes and improvements
|
2017-12-05 17:17:35 -02:00 |
|
Ghazi Triki
|
27c65f145d
|
Code improvements and cleanup.
|
2017-12-05 19:44:17 +01:00 |
|
Ghazi Triki
|
84f77a5e4c
|
Fix PopUpButtonSkin to follow component life-cycle guidelines.
|
2017-12-05 18:35:25 +01:00 |
|
Chad Pilkey
|
dd498ebf3a
|
correct build warnings in akka-apps
|
2017-12-04 22:23:06 -05:00 |
|
Chad Pilkey
|
5fc5cdbf8d
|
Merge remote-tracking branch 'upstream/master' into cleanup-akka-apps
|
2017-12-04 21:42:21 -05:00 |
|
Anton Georgiev
|
e5060ea6b4
|
Merge pull request #4734 from OZhurbenko/presenter-functionality-2x
Whiteboard touch events support, bug fixes, improvements
|
2017-12-04 18:59:59 -02:00 |
|
Anton Georgiev
|
446f539e89
|
add bool join parameter joinViaHtml5 -- to prefer html5 over flash client
|
2017-12-04 15:29:25 -05:00 |
|
Ghazi Triki
|
73b901bb38
|
Use Canavas as item render to follow guidelines.
|
2017-12-04 20:04:11 +01:00 |
|
Ghazi Triki
|
aeabaa6999
|
Delete unused podItemTitle style.
|
2017-12-04 19:21:52 +01:00 |
|
Chad Pilkey
|
158fb6c7b2
|
cleanup of old java messages and other unused code
|
2017-12-04 12:31:16 -05:00 |
|
Ghazi Triki
|
9b3415e9a6
|
Update PresentationPodControlItemRenderer to mxml renderer.
|
2017-12-04 17:06:23 +01:00 |
|