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
|
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 |
|
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 |
|
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
|
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
|
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 |
|
Klaus
|
6cc46b8627
|
Add const to voiceUser
|
2017-08-01 13:04:20 -03: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
|
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 |
|
Klaus
|
d06c49a6b8
|
Move from voice-user to voice-users
|
2017-07-31 16:36:41 -03:00 |
|
Anton Georgiev
|
7d50c01a4a
|
Merge pull request #4126 from Klauswk/html5-2x-handle-meeting-end
[HTML5 2.0] Handling meeting end
|
2017-07-31 15:29:15 -04:00 |
|
Anton Georgiev
|
1b2591653b
|
Merge pull request #4168 from oswaldoacauan/user-join-req-msg
[HTML5] Implements the new join flow
|
2017-07-31 15:25:24 -04:00 |
|
Oswaldo Acauan
|
f217304e19
|
Add publish to UserJoinMetting to the auth flow
|
2017-07-31 15:48:56 -03:00 |
|
Anton Georgiev
|
7b40122c89
|
Merge pull request #4121 from mmarangoni/call-manager
[HTML5] Implemented AudioManager
|
2017-07-31 14:29:42 -04:00 |
|
Klaus
|
0a1091f871
|
Merge branch 'slides-refactor-2x' of https://github.com/klauswk/bigbluebutton into slides-refactor-2x
|
2017-07-31 09:04:07 -03:00 |
|
Klaus
|
03f0061e2c
|
Fix lint
|
2017-07-31 09:03:46 -03:00 |
|
Oleksandr Zhurbenko
|
4e31181690
|
Resolve Alex cherry-pick
|
2017-07-31 08:30:08 -03:00 |
|
Klaus
|
9bc9116e5c
|
handling a few messages
|
2017-07-31 08:10:52 -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
|
e43a44e828
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options
|
2017-07-28 08:47:56 -03:00 |
|
Klaus
|
eac898e81d
|
Merge branch 'bbb-2x-mconf' into html5-2x-chat-options
|
2017-07-27 17:36:01 -03:00 |
|
Klauswk
|
e751bcdadf
|
Merge branch 'bbb-2x-mconf' into slides-refactor-2x
|
2017-07-27 17:27:35 -03:00 |
|
Klaus
|
e23d75c16b
|
Captions mapped
|
2017-07-27 17:18:44 -03:00 |
|
Anton Georgiev
|
13b406313e
|
drop handling of fsesl->akka-apps events
|
2017-07-27 11:27:06 -04:00 |
|
Klaus
|
b015c98f82
|
Mapped annotations
|
2017-07-27 10:45:40 -03:00 |
|
Klaus
|
c13155aa6a
|
Move shapes to annotations
|
2017-07-27 09:35:55 -03:00 |
|
Anton Georgiev
|
4c19d0589b
|
reorganize object destruction
|
2017-07-26 14:01:38 -04:00 |
|
Matthew Marangoni
|
0ab3bcc599
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into call-manager
|
2017-07-26 10:59:05 -07:00 |
|
Matthew Marangoni
|
7c0d802f27
|
fixed undefined extension
|
2017-07-26 10:58:39 -07:00 |
|
Anton Georgiev
|
5ca6f63d7e
|
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into html5-2x-fix-audio
|
2017-07-26 13:49:57 -04:00 |
|