Commit Graph

19514 Commits

Author SHA1 Message Date
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
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
Oleksandr Zhurbenko
68391cc782 Added touch events support for the cursor 2017-12-01 19:35:15 -08: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
Tainan Felipe
b58248bafc fix React warns in emoji select 2017-12-01 11:11:17 -02:00
Tainan Felipe
964c4195a3 refactor user left message 2017-12-01 10:01:07 -02: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
Anton Georgiev
d6e8396407 add configuration to join via html5 for attendee or mod 2017-11-30 15:19:03 -05:00
Anton Georgiev
28215f1614
Merge pull request #4682 from KDSBrowne/z15-fix-userlist-border-onclick
Disable pointer-events on lists in the userlist
2017-11-30 16:36:01 -02:00
Richard Alam
3ed4b30063 Merge branch 'riadvice-fix-presentation' 2017-11-30 10:21:39 -08:00
Anton Georgiev
fca0cfd9bf
Merge pull request #4742 from Tainan404/fix-min/max-error
Readd missing messages.
2017-11-30 12:42:45 -02:00
Tainan Felipe
19723f3da1 change id of the intl 2017-11-30 08:29:52 -02: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
Tainan Felipe
488f9eacc3 Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-design 2017-11-29 09:32:39 -02:00
Tainan Felipe
2afd7b16a0 readd missing messages 2017-11-29 08:48:57 -02:00
Maxim Khlobystov
bc3fd3bc06
Merge pull request #4726 from antobinary/mute-toggle-work
Pass mute boolean in redis msg on mute/unmute user
2017-11-28 15:58:06 -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
Anton Georgiev
edac480963
Merge pull request #4725 from MaximKhlobystov/bulgarian-bug-vol-3
Bulgarian Bug Vol. 3
2017-11-27 19:09:19 -02:00
Oleksandr Zhurbenko
006b7c7af6 Corrected logging for the clearAnnotations method 2017-11-27 11:23:38 -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
Anton Georgiev
5e9e3f8cf7
Merge pull request #4729 from riadvice/html-center
Improve bigbluebutton-client/resources/prod/BigBlueButton.html
2017-11-27 13:32:45 -02:00