JaeeunCho
|
ab81ebfcfd
|
added new line at the end of service.js
|
2017-08-14 13:05:59 -07:00 |
|
JaeeunCho
|
11d181327c
|
created service.js moved makeCall to service.js
|
2017-08-14 13:03:37 -07:00 |
|
JaeeunCho
|
1dff7f0ef2
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users
|
2017-08-14 12:56:56 -07:00 |
|
Klaus
|
e996bea1e9
|
Handling separate redis channel
|
2017-08-14 15:55:17 -03:00 |
|
JaeeunCho
|
237d1b6ac3
|
divided code into new container.jsx
|
2017-08-11 13:32:33 -07:00 |
|
JaeeunCho
|
b20ea78e2a
|
fixed conflict
|
2017-08-10 14:34:21 -07:00 |
|
JaeeunCho
|
405ead47c2
|
added new line at styles.scss
|
2017-08-08 15:29:22 -07:00 |
|
JaeeunCho
|
33f0104b5a
|
changed logout confirmation
|
2017-08-08 15:27:34 -07:00 |
|
JaeeunCho
|
8590d2f414
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users
|
2017-08-08 12:31:56 -07:00 |
|
Klauswk
|
0ce41afabb
|
Merge branch 'bbb-2x-mconf' into html5-toggle-mute
|
2017-08-08 13:59:00 -03:00 |
|
Oswaldo Acauan
|
716ee5902f
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design
|
2017-08-08 11:52:26 -03:00 |
|
Klaus
|
526518e740
|
Remove duplicate lines
|
2017-08-04 17:20:24 -03:00 |
|
Klaus
|
0807960da4
|
Fix missing method for mute user
|
2017-08-04 17:05:18 -03:00 |
|
Oswaldo Acauan
|
e07c8b41af
|
Add autofocus when switching/entering chat
|
2017-08-04 15:32:21 -03:00 |
|
Oswaldo Acauan
|
78e88c8189
|
Fix unread counter
|
2017-08-04 15:20:54 -03:00 |
|
Oswaldo Acauan
|
720dddec24
|
Fix chat styles
|
2017-08-04 15:17:15 -03:00 |
|
Oswaldo Acauan
|
0022c121d3
|
Fix chat bug and styles
|
2017-08-04 14:58:55 -03:00 |
|
Anton Georgiev
|
6afb7ca8b3
|
Merge pull request #4124 from Klauswk/html5-2x-chat-options
[HTML5 2.0] Add public chat new options
|
2017-08-03 14:33:32 -04:00 |
|
Klaus
|
e4e7f1da2c
|
Move domain functions to service.js
|
2017-08-03 11:10:05 -03:00 |
|
Oswaldo Acauan
|
bc3679c0b4
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design
|
2017-08-03 09:53:44 -03:00 |
|
Anton Georgiev
|
1494c23858
|
Merge pull request #4189 from Klauswk/html5-hotfix-voiceuser
[HTML5 2.0] Fix VoiceUser microphone state
|
2017-08-03 08:53:01 -04: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 |
|
Klaus
|
e02e5d75ce
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options
|
2017-08-03 09:17:50 -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
|
7b8eb8027c
|
Merge clear annotations and annotationsWhiteboard
|
2017-08-02 17:14:01 -03:00 |
|
Klaus
|
4495c2e897
|
Move from annotation/ to annotations/
|
2017-08-02 16:52:13 -03:00 |
|
Klaus
|
c5646069fd
|
Using the older insert method inside addShape
|
2017-08-02 16:46:29 -03:00 |
|
Klaus
|
e7b9eab5b6
|
Move makeCall to service file
|
2017-08-02 14:05:20 -03:00 |
|
Klaus
|
63fee3b615
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options
|
2017-08-02 11:36:16 -03:00 |
|
Klaus
|
d45ae64558
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x
|
2017-08-02 11:29:33 -03:00 |
|
Klaus
|
a0368e55cf
|
Fix voiceUser mic states
|
2017-08-02 10:11:53 -03:00 |
|
Anton Georgiev
|
64b597c420
|
Merge pull request #4179 from Klauswk/html5-2x-voice-user
[HTML5 2.0] Move AudioUsers to his own Collection
|
2017-08-01 14:38:26 -04:00 |
|
Oswaldo Acauan
|
35fd834397
|
Fix error when a user have no subName
|
2017-08-01 14:50:33 -03:00 |
|
Oswaldo Acauan
|
df35a22676
|
Merge branch 'bbb-2x-mconf' into userlist-2x-design
|
2017-08-01 14:29:12 -03:00 |
|
Klaus
|
0a9abf6273
|
Remove user.listenOnly
|
2017-08-01 14:02:41 -03:00 |
|
JaeeunCho
|
e663458d01
|
added div for description
|
2017-08-01 09:17:03 -07:00 |
|
JaeeunCho
|
08818948ac
|
changed logout-confirmation and en.json
|
2017-08-01 09:09:06 -07:00 |
|
Klaus
|
6cc46b8627
|
Add const to voiceUser
|
2017-08-01 13:04:20 -03:00 |
|
JaeeunCho
|
e4f94f1d91
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users
|
2017-08-01 08:55:02 -07:00 |
|
JaeeunCho
|
04636ca25b
|
[HTML5] added endMeeting by moderator
|
2017-08-01 08:53:05 -07:00 |
|
Klaus
|
fc6713013a
|
Move method to VoiceUser
|
2017-08-01 12:00:07 -03:00 |
|
Anton Georgiev
|
04a7781ea6
|
Merge pull request #4172 from mmarangoni/call-manager
[HTML5] Remove audio API duplication & Join Audio fix
|
2017-08-01 10:23:09 -04:00 |
|
Klaus
|
ed7d9a3a63
|
Change wrong log
|
2017-08-01 10:55:00 -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 |
|
Anton Georgiev
|
2fd4bc4330
|
handle PresentationConversionCompletedEvtMsg
|
2017-07-31 17:08:09 -04:00 |
|
Matthew Marangoni
|
2494f48f52
|
removed unused constructor
|
2017-07-31 13:54:18 -07:00 |
|
Klaus
|
1ff3df770a
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-voice-user
|
2017-07-31 17:01:04 -03:00 |
|