Commit Graph

18721 Commits

Author SHA1 Message Date
Maxim Khlobystov
a7798f6c1a Fixed some ESLint errors. 2017-10-05 19:18:30 +00:00
Ghazi Triki
ae5e448a97 Add hint label above poll button. 2017-10-05 20:11:14 +01:00
Maxim Khlobystov
c3ba004bec Hidden Push Notifications setting's UI until it is implemented. 2017-10-05 19:06:28 +00:00
Anton Georgiev
af0e0ff5a0 Merge pull request #4460 from KDSBrowne/xx-05-avatar-voiceUser-notification
[HTML5] Avatar indicator bug's
2017-10-05 13:02:13 -04:00
Oswaldo Acauan
360d8d12b2 Remove user list title 2017-10-05 11:52:34 -03:00
Oswaldo Acauan
a34ec8eb0d Update chat list item text color 2017-10-05 11:47:35 -03:00
Oswaldo Acauan
0ec0121648 User avatar styles update 2017-10-05 11:43:08 -03:00
Anton Georgiev
9550d70184 Merge pull request #4458 from antobinary/pods_vol3
Enable presentation token storage in bbb-web
2017-10-04 18:40:01 -04:00
Anton Georgiev
b4210ea12f enable presentation token storage in bbb-web 2017-10-04 18:38:28 -04:00
KDSBrowne
d4b8706926 fix talking style being shown when muted 2017-10-04 12:08:33 -07:00
KDSBrowne
d689e7d166 fix isVoiceUser prop in mappedUser service 2017-10-04 11:45:58 -07:00
Anton Georgiev
6b1a29eab4 Merge pull request #4426 from OZhurbenko/presenter-functionality-2x
HTML5 - Whiteboard/Presentation fixes, improvements, refactoring
2017-10-04 14:05:03 -04:00
Anton Georgiev
0bc3490ecc Merge pull request #4419 from KDSBrowne/xx-03-kick-user-bug
[HTML5] - Handle UserEjectedFromMeetingEvtMsg
2017-10-04 11:47:07 -04:00
KDSBrowne
f635dbf2ae remove import and function call 2017-10-04 08:45:05 -07:00
KDSBrowne
d347864b19 update removeUser modifier props 2017-10-04 08:22:56 -07:00
KDSBrowne
7225590c05 fix userEjected modifier and change if condition 2017-10-04 07:57:16 -07:00
KDSBrowne
e241d6bf68 remove unused voice-user method 2017-10-04 07:39:13 -07:00
Richard Alam
c42fb1e0fc Merge pull request #4456 from ritzalam/implement-multi-chat
- fix passing of guest policy through create api
2017-10-03 17:46:30 -04:00
Richard Alam
b87adb98fb - fix passing of guest policy through create api 2017-10-03 14:45:32 -07:00
Oleksandr Zhurbenko
ab95c87f48 Fixed wb toolbar console warnings cause by improper props validation 2017-10-03 14:28:44 -07:00
Richard Alam
79dccefecb Merge branch 'riadvice-information-bar' 2017-10-03 14:19:50 -07:00
Richard Alam
3a9c4bb8ff Merge branch 'implement-multi-chat' into riadvice-information-bar 2017-10-03 14:05:34 -07:00
Richard Alam
a3e37dffa5 Merge branch 'information-bar' of https://github.com/riadvice/bigbluebutton 2017-10-03 14:04:12 -07:00
Richard Alam
6ce535b0d2 - change default policy to always accept 2017-10-03 14:03:16 -07:00
Ghazi Triki
e96d6ae726 Add new API options to display a banner in the client. 2017-10-03 21:49:06 +01:00
Richard Alam
7975b7da13 Merge pull request #4454 from ritzalam/implement-multi-chat
- create private and public chats
2017-10-03 16:43:36 -04:00
Richard Alam
2958095b32 - create private and public chats 2017-10-03 13:42:24 -07:00
Anton Georgiev
7932ebd938 Merge pull request #4413 from KDSBrowne/x2.0.6-custom-button-focus
[HTML5] - Custom Element Focus Styles
2017-10-03 16:21:25 -04:00
KDSBrowne
83d4474b51 remove if statment and unused imports 2017-10-03 13:03:18 -07:00
Anton Georgiev
5ad6b86f6d Merge pull request #4453 from oswaldoacauan/fix-user-list-voice
[HTML5] Fix bug when user wasnt in voiceConf
2017-10-03 15:40:26 -04:00
KDSBrowne
078e8b579a remove Logger messages and switch allowHTML5Moderator to false 2017-10-03 12:38:59 -07:00
Jesus Federico
b770b22316 Merge pull request #4452 from jfederico/v2.0.x-release
bbb-client: Updated language files
2017-10-03 15:26:33 -04:00
Oswaldo Acauan
ef5eefc786 Revert wrong isLocked mapping 2017-10-03 16:26:32 -03:00
Oswaldo Acauan
32632151d5 Fix bug when user wasnt in voiceConf 2017-10-03 16:22:26 -03:00
jfederico
f27d24651c bbb-client: Updated language files 2017-10-03 19:21:55 +00:00
KDSBrowne
af4676ea38 pass userId to publishUserMessage 2017-10-03 12:20:03 -07:00
KDSBrowne
2d62b79165 switch to correct event name 2017-10-03 12:12:19 -07:00
Richard Alam
5a2e4cbf9e Merge pull request #4450 from ritzalam/implement-multi-chat
Developing next release
2017-10-03 14:13:59 -04:00
Richard Alam
5b2cda0723 Merge branch 'antobinary-pods_vol3' into implement-multi-chat 2017-10-03 11:02:52 -07:00
Richard Alam
04ae60f6aa - fix determining of guest status 2017-10-03 11:01:48 -07:00
KDSBrowne
0838e21674 change css classes to SASS placeholders 2017-10-03 11:00:04 -07:00
Richard Alam
5628ee9004 Merge pull request #4448 from ritzalam/implement-multi-chat
Development for the next release
2017-10-03 13:41:02 -04:00
Oleksandr Zhurbenko
76bcdd55d6 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-10-03 10:34:10 -07:00
KDSBrowne
3eed1ec1c0 remove voice user check in userEjected.js 2017-10-03 08:45:36 -07:00
Richard Alam
058751c3f2 Merge branch 'pods_vol3' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol3 2017-10-03 08:44:26 -07:00
Anton Georgiev
301003bc2d cleanup 2017-10-03 11:43:16 -04:00
Richard Alam
ac599366be - remove akka http prototype as redis scala is incompatible with the latest akka release 2017-10-03 08:36:18 -07:00
KDSBrowne
fdb38bb89c remove console logs 2017-10-03 08:28:49 -07:00
KDSBrowne
9bad8d8d5d add kickVoiceUser and fix presenter assign bug 2017-10-03 08:25:56 -07:00
Richard Alam
51405e4018 - open private chat only in main chat window 2017-10-03 08:20:53 -07:00