Commit Graph

18427 Commits

Author SHA1 Message Date
KDSBrowne
584f7e4bc8 add checks to handler 2017-10-06 11:12:33 -07:00
KDSBrowne
d89f0e511f Merge branch 'v2.0.x-release' into xx-07-allow-html5-modorator 2017-10-06 11:02:17 -07:00
KDSBrowne
9da39339cd remove unused checks 2017-10-06 10:56:56 -07:00
Anton Georgiev
bb1960ef6a Merge pull request #4469 from Gcampes/fix-breakout-close
[HTML5] - Fix Breakout tab not closing
2017-10-06 13:56:22 -04:00
KDSBrowne
d70bfdb337 remove code duplication 2017-10-06 10:52:14 -07:00
KDSBrowne
36ebec64c5 change modifier name 2017-10-06 09:16:55 -07:00
KDSBrowne
fc4b0dbcb1 add changeRole handler call to changeRole modifier 2017-10-06 09:10:23 -07:00
KDSBrowne
5c1ff8efbc fix promoted users not being able to execute moderator actions 2017-10-06 08:18:27 -07:00
gcampes
189760d393 fix breakout not closing on end 2017-10-06 11:58:21 -03:00
Anton Georgiev
edf569f479 Merge pull request #4466 from OZhurbenko/presenter-functionality-2x
HTML5 - Fix for an incorrectly displayed pop-up in the UserList
2017-10-06 10:00:36 -04:00
Anton Georgiev
9ae15aa310 Merge pull request #4463 from antobinary/change-welcome-message
Welcome msg-drop location of phone icon so it applies to both html5 and flash clients
2017-10-06 09:55:34 -04:00
KDSBrowne
b20ab84abd make changeRole.js return publishUserMessage 2017-10-06 06:31:56 -07:00
KDSBrowne
58ab2f974d add missing locale string 2017-10-06 06:29:16 -07:00
KDSBrowne
4191ce56ed set allowHTML5Moderator to true 2017-10-06 06:27:45 -07:00
Fred Dixon
9d8a4bd45d Merge pull request #4467 from riadvice/2x-client-theme
[Flash 2.0] - Improve poll and add new feature "moderatorUnmute"
2017-10-06 08:20:45 -04:00
Ghazi Triki
cb1ae776ea Added new option "moderatorUnmute" 2017-10-06 10:57:19 +01:00
Oleksandr Zhurbenko
6639ee5e8e Fixed incorrectly displayed dropdown in the user list, if it was scrolled down 2017-10-05 14:46:46 -07:00
Anton Georgiev
9cdf0897c3 welcome msg - drop location of phone icon from msg 2017-10-05 16:46:28 -04:00
Anton Georgiev
7cd475b2bf Merge pull request #4461 from MaximKhlobystov/hide-push-notifications-setting
[HTML5] Hide Push Notifications Setting
2017-10-05 16:23:55 -04:00
Ghazi Triki
23bb6bd34e Show hint for presenters in PollResultsModal. 2017-10-05 21:18:57 +01:00
Maxim Khlobystov
03c94bba73 Dropped the file extension from the stylesheet name. 2017-10-05 19:40:38 +00:00
Maxim Khlobystov
350bbdfcc9 Added a comment to not forget about the push notifications setting. 2017-10-05 19:21:57 +00:00
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
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
Oleksandr Zhurbenko
ab95c87f48 Fixed wb toolbar console warnings cause by improper props validation 2017-10-03 14:28:44 -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
KDSBrowne
0838e21674 change css classes to SASS placeholders 2017-10-03 11:00:04 -07: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
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