Oleksandr Zhurbenko
|
43b3b89c6a
|
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
|
2017-09-11 12:11:03 -07:00 |
|
Anton Georgiev
|
bf35fa7a4c
|
Merge pull request #4354 from KDSBrowne/x2.0.1-fix-lock-issue-userlist
[HTML5] - Fix Userlist Lock Notification
|
2017-09-11 12:07:17 -04:00 |
|
KDSBrowne
|
eeb878649a
|
remove single quotes from variable
|
2017-09-11 06:42:56 -07:00 |
|
KDSBrowne
|
13e6357b19
|
fix line endings
|
2017-09-07 07:31:19 -07:00 |
|
KDSBrowne
|
5a6183dc34
|
fix undefined check
|
2017-09-06 12:57:24 -07:00 |
|
KDSBrowne
|
9193ae8849
|
handle UserLockedInMeetingEvtMsg
|
2017-09-06 12:53:07 -07:00 |
|
Oleksandr Zhurbenko
|
251bd22738
|
PR review fixes
|
2017-09-06 12:36:52 -07:00 |
|
KDSBrowne
|
31cf7aea42
|
check for specific meeting id
|
2017-09-06 11:32:29 -07:00 |
|
KDSBrowne
|
fd9a4cd98e
|
fix bug in undefined check
|
2017-09-06 11:13:24 -07:00 |
|
KDSBrowne
|
d34f138b56
|
check if lock settings are undefined
|
2017-09-06 10:50:48 -07:00 |
|
Oleksandr Zhurbenko
|
65da71c12a
|
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
|
2017-09-05 18:53:51 -07:00 |
|
KDSBrowne
|
94e44d6a23
|
remove unused prop
|
2017-08-31 13:50:20 -07:00 |
|
KDSBrowne
|
a404cc14d1
|
remove space typo
|
2017-08-31 13:47:06 -07:00 |
|
KDSBrowne
|
2f9d4bcc0e
|
move isMeetingLocked condition check to userlist service
|
2017-08-31 11:12:53 -07:00 |
|
KDSBrowne
|
a01451f9fd
|
handle LockSettingsInMeetingChangedEvtMsg and fix userlistitem lock notification
|
2017-08-30 11:00:56 -07:00 |
|
Oleksandr Zhurbenko
|
643d55938c
|
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
|
2017-08-16 19:24:59 -07:00 |
|
JaeeunCho
|
3f773684bc
|
[HTML5] changed string id to camelCase
|
2017-08-10 10:34:34 -07:00 |
|
Klauswk
|
0ce41afabb
|
Merge branch 'bbb-2x-mconf' into html5-toggle-mute
|
2017-08-08 13:59:00 -03:00 |
|
Klaus
|
0807960da4
|
Fix missing method for mute user
|
2017-08-04 17:05:18 -03:00 |
|
Oswaldo Acauan
|
0022c121d3
|
Fix chat bug and styles
|
2017-08-04 14:58:55 -03:00 |
|
Oswaldo Acauan
|
b53636ec19
|
Fix avatar colors and text capitalization
|
2017-08-03 09:36:26 -03:00 |
|
Oswaldo Acauan
|
14f586faad
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design
|
2017-08-03 09:23:12 -03:00 |
|
Oswaldo Acauan
|
00db9ee5bb
|
Comment out compact user-list toggle
|
2017-08-03 09:06:59 -03:00 |
|
Oswaldo Acauan
|
92da0ace60
|
Fix error when a user have no subName and hide compact toggle
|
2017-08-03 09:05:17 -03:00 |
|
Klaus
|
d45ae64558
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x
|
2017-08-02 11:29:33 -03:00 |
|
Oleksandr Zhurbenko
|
b207a1275e
|
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
|
2017-08-01 13:49:46 -07:00 |
|
Oswaldo Acauan
|
35fd834397
|
Fix error when a user have no subName
|
2017-08-01 14:50:33 -03:00 |
|
Klaus
|
11cf4b8d78
|
A few fixes on client
|
2017-08-01 10:41:24 -03:00 |
|
Klaus
|
9d42ca9bd7
|
Move from users to voice-users
|
2017-08-01 10:10:12 -03:00 |
|
Oswaldo Acauan
|
e93f3c0fd5
|
Remove logs
|
2017-07-28 10:49:48 -03:00 |
|
Oswaldo Acauan
|
83c117ddde
|
Match user-list with the new styles
|
2017-07-28 10:43:39 -03:00 |
|
Klaus
|
9ab4430f68
|
Fix merge stuff
|
2017-07-26 11:31:35 -03:00 |
|
Klaus
|
eea2c0ee8b
|
Refactor user
|
2017-07-26 11:09:07 -03:00 |
|
Oswaldo Acauan
|
dbb6b5cd12
|
New user-list colors
|
2017-07-18 10:12:26 -03:00 |
|
Oleksandr Zhurbenko
|
23263c997b
|
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
|
2017-07-17 16:01:05 -07:00 |
|
Anton Georgiev
|
bc9083c0cf
|
Merge pull request #4109 from Klauswk/fix-sass-path
[HTML5 - 2.0] Change relative path of the sass imports to absolute
|
2017-07-17 14:58:02 -04:00 |
|
Klaus
|
6b0edb353e
|
Change all from single quotes to double quotes
|
2017-07-17 15:56:05 -03:00 |
|
Klaus
|
87943cb3f8
|
Change relative path of the sass to absolute
|
2017-07-17 15:21:45 -03:00 |
|
Klaus
|
3af281d648
|
Merge remote-tracking branch 'upstream/master' into merge-master-mconf
|
2017-07-17 13:33:45 -03:00 |
|
Oleksandr Zhurbenko
|
82a1ad2c8a
|
Merge branch 'presenter-functionality' of https://github.com/OZhurbenko/bigbluebutton into presenter-functionality-2x
|
2017-07-14 15:43:41 -07:00 |
|
Anton Georgiev
|
d2d6e1d029
|
Merge pull request #4056 from KDSBrowne/x03-client-audit-semantics
[HTML5] - Accessibility Contrast & Semantic Fixes
|
2017-07-14 15:17:49 -04:00 |
|
Anton Georgiev
|
586c51fcac
|
Merge pull request #4080 from Klauswk/bbb-2x-emoji-messages
[HTML5 2.0] Move emoji messages to 2.0
|
2017-07-14 10:39:16 -04:00 |
|
Klaus
|
54234cecac
|
Handling emoji messages
|
2017-07-13 10:15:42 -03:00 |
|
Klaus
|
111ad9171b
|
Remove strings and add constants
|
2017-07-12 17:15:50 -03:00 |
|
Klaus
|
8cd4b752ef
|
Remove strings and add constants
|
2017-07-12 17:02:55 -03:00 |
|
Klaus
|
2aa603d195
|
Merge branch 'bbb-2x-mconf' into html5-2x-chat-messages
|
2017-07-12 16:29:07 -03:00 |
|
Klaus
|
1dfb054323
|
A few hotfixes to make the html5 client join again
|
2017-07-12 15:51:29 -03:00 |
|
Klaus
|
898f7c97e3
|
Sending private message
|
2017-07-12 10:18:26 -03:00 |
|
Klaus
|
e19ea05a75
|
Remove 'this.window', break the client
|
2017-07-12 09:59:51 -03:00 |
|
Klaus
|
73f49bb46a
|
Sending public message
|
2017-07-12 09:42:16 -03:00 |
|