Commit Graph

19371 Commits

Author SHA1 Message Date
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
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
Richard Alam
66bdd10e6a Merge branch 'capilkey-fix-default-locale-selector' 2017-11-30 13:51:22 -08:00
Richard Alam
12e47d1bd6 Merge branch 'fix-default-locale-selector' of https://github.com/capilkey/bigbluebutton into capilkey-fix-default-locale-selector 2017-11-30 13:41:47 -08:00
Richard Alam
0f23891649 - set no presenter to a pod if presenter group is empty 2017-11-30 13:24:19 -08:00
Richard Alam
fdf075e7df - look for all pods where the user was the presenter 2017-11-30 13:10:37 -08:00
Richard Alam
0a2610ab18 - when a presenter on a pod leaves, assigne another presenter into that pod 2017-11-30 12:58:02 -08:00
Richard Alam
3ed4b30063 Merge branch 'riadvice-fix-presentation' 2017-11-30 10:21:39 -08:00
Ghazi Triki
1285a4e203 Fix PresentationWindow title. 2017-11-30 11:16:32 +01:00
Chad Pilkey
6cd27d49e5 avoid null exceptions 2017-11-29 18:26:44 -05:00
Chad Pilkey
e4c33baf86 fix language state intialization 2017-11-29 18:19:43 -05:00
Richard Alam
35277b7447 - remove unused imports 2017-11-28 10:54:58 -08:00
Richard Alam
10ae91649e Merge branch 'riadvice-fix-user' 2017-11-28 07:40:05 -08:00
Richard Alam
7b9cb07d81 Merge branch 'fix-user' of https://github.com/riadvice/bigbluebutton into riadvice-fix-user 2017-11-28 07:31:58 -08:00
Ghazi Triki
8201d54088 Update and fix displaying private and group chats. 2017-11-28 09:58:28 +01:00
Richard Alam
72e3fb1478
Merge pull request #4735 from ritzalam/fix-max-upload-size
Add property to to set max file upload
2017-11-27 17:21:44 -05:00
Richard Alam
5bf8258074 - make max file uploaded presentation 2017-11-27 14:03:50 -08:00
Ghazi Triki
eacafb6c87 Delete user from private chat list when he leaves the conference. 2017-11-27 18:24:12 +01:00
Richard Alam
1378a75bdd Merge branch 'riadvice-flex-improve' 2017-11-27 08:17:45 -08:00
Richard Alam
8a782ff163 Merge branch 'flex-improve' of https://github.com/riadvice/bigbluebutton into riadvice-flex-improve 2017-11-27 08:05:56 -08:00
Ghazi Triki
bdadfa9410 UI and style improvements. 2017-11-27 16:55:52 +01:00
Richard Alam
ea3cba1bf5 Merge branch 'capilkey-hide-chatpod-create-viewers' 2017-11-27 07:49:52 -08:00
Ghazi Triki
664e47b40b Code cleanup. 2017-11-26 16:25:04 +01:00
Ghazi Triki
57f5719e22 Fix guest tooltips. 2017-11-25 18:32:03 +01:00