Commit Graph

19393 Commits

Author SHA1 Message Date
Chad Pilkey
1587b7560c remove SyncWhiteboardAccess from one more place 2017-12-13 12:14:04 -05:00
Chad Pilkey
cf25541a98 fix cursor for presenter 2017-12-13 12:13:30 -05:00
Chad Pilkey
37f544be93 change whiteboard collection from ArrayCollection to Hashmap for quicker lookup 2017-12-13 02:19:38 -05:00
Chad Pilkey
61a14a0079 completely clear the annotation and cursor holders on whiteboard switch 2017-12-13 02:19:09 -05:00
Chad Pilkey
4881fbbc0b clean up spacing for WhiteboardMsgs so they're easier to read 2017-12-13 02:17:36 -05:00
Chad Pilkey
ccc7e5b0a4 remove third green from whiteboard toolbar colours 2017-12-13 02:15:47 -05:00
Chad Pilkey
1551dcae15 move multiuser to be per-whiteboard 2017-12-13 02:14:43 -05:00
Chad Pilkey
860fd2a5df fix meeting mute and disable unmute of others 2017-12-11 00:00:32 -05: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
Ghazi Triki
5e47e47e7f Fix presentation download. 2017-12-08 11:49:45 +01:00
Ghazi Triki
dac267d2e9 Export poll result as bitmap into PDF. 2017-12-07 21:21:45 +01: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
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
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
Anton Georgiev
196d77bcf5
Merge pull request #4748 from ritzalam/assign-pod-presenter
- when a presenter on a pod leaves, assign another presenter into th…
2017-12-04 14:00:52 -02:00
Richard Alam
cf87051db1 Merge branch 'riadvice-fix-presentation' 2017-12-03 16:16:09 -08:00
Richard Alam
6e6898a04b Merge branch 'fix-presentation' of https://github.com/riadvice/bigbluebutton into riadvice-fix-presentation 2017-12-03 16:06:33 -08:00
Richard Alam
ba50cd8de5
Merge pull request #4741 from ritzalam/cleanup-bbb-web
Cleanup
2017-12-03 19:05:16 -05:00
Ghazi Triki
96f12da2a4 Use ComboBox2 in ScreensharePublishWindow and ShortcutHelpWindow. 2017-12-03 20:14:00 +01:00
Ghazi Triki
9869b55ec0 Created a new ComboBox2 with a new behaviour that prevents its popup from closing when its MDIWindow parent is focused. 2017-12-03 20:07:42 +01:00
Richard Alam
ab2b1a6a35 - do allow mute/unmute self when lock settings is applied 2017-12-01 13:43:23 -08:00
Richard Alam
4ced34d9d1 - remove button to approve only guests or authenticated users 2017-12-01 13:04:33 -08:00
Richard Alam
7b80d678dd - remove user from presenter list when removed from presenter group 2017-11-30 15:14:42 -08:00