Commit Graph

18566 Commits

Author SHA1 Message Date
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
KDSBrowne
4ac9f0de9a change toggle-switch colors 2017-10-05 12:21:11 -07: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
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
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
Richard Alam
5dcb173ff9 Merge branch 'riadvice-2x-client-theme' into v2.0.x-release 2017-10-02 18:02:02 -07:00
Richard Alam
8ae38b6f5a - format 2017-10-02 18:01:33 -07:00
Richard Alam
5b05df9562 Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-10-02 17:44:58 -07:00
KDSBrowne
67a621c6c5 add focus-border-offset css variable 2017-10-02 13:39:04 -07:00
KDSBrowne
0b50594b91 remove cal funtion 2017-10-02 13:36:37 -07:00
KDSBrowne
97aca5ee91 re apply userlist focus styles 2017-10-02 12:49:26 -07:00
KDSBrowne
10f95f11e1 fix merge conflicts 2017-10-02 12:37:51 -07:00
Richard Alam
e066b7de3b Merge pull request #4444 from kepstin/bbb-20-rec-fixes
Correctly handle a recording start being the last event in a recording.
2017-10-02 14:17:08 -04:00
Ghazi Triki
ab93ae6c22 Fix send breakout room join url for late joiners. 2017-10-02 18:56:36 +01:00
Anton Georgiev
5c071756a0 Merge pull request #4438 from KDSBrowne/xx-04-logoutURL-issue
[HTML5] - logoutRouteHandler Fix
2017-10-02 13:33:54 -04:00
Anton Georgiev
48dfc178ba Merge pull request #4423 from oswaldoacauan/presentation-manager-merge
[HTML5 2.0] Presentation Manager
2017-10-02 13:31:28 -04:00
Calvin Walton
e37db34eb4 Correctly handle a recording start being the last event in a recording.
In some unusual cases, the recording start can be the last event in the
events file, or at least have the same timestamp as such.

Add some code to check the array bounds and break if needed, so we
don't check the timestamp on the (non-existant) event after the last
event.
2017-10-02 12:31:31 -04:00
Oswaldo Acauan
230a2d5263 Fix silent changes caused by the old pr revert 2017-10-02 11:12:58 -03:00
Oswaldo Acauan
89c2947d78 Merge remote-tracking branch 'upstream/v2.0.x-release' into presentation-manager-merge 2017-09-29 17:32:31 -03:00
KDSBrowne
bc0647ad50 fix merge conflicts 2017-09-29 12:04:27 -07:00
KDSBrowne
3b6aed34ae check for voice user and remove if exists 2017-09-29 11:58:24 -07:00