Oleksandr Zhurbenko
|
251bd22738
|
PR review fixes
|
2017-09-06 12:36:52 -07: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
|
7b8eb8027c
|
Merge clear annotations and annotationsWhiteboard
|
2017-08-02 17:14:01 -03:00 |
|
Klaus
|
d45ae64558
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x
|
2017-08-02 11:29: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 |
|
Klaus
|
1ff3df770a
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-voice-user
|
2017-07-31 17:01:04 -03:00 |
|
Oswaldo Acauan
|
f217304e19
|
Add publish to UserJoinMetting to the auth flow
|
2017-07-31 15:48:56 -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
|
9ab4430f68
|
Fix merge stuff
|
2017-07-26 11:31:35 -03:00 |
|
Klaus
|
745b9070f6
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x
|
2017-07-26 11:11:40 -03:00 |
|
Klaus
|
eea2c0ee8b
|
Refactor user
|
2017-07-26 11:09:07 -03:00 |
|
Klaus
|
9cd3ac3f87
|
Merge branch 'bbb-2x-mconf' into fix-presenter-rule
|
2017-07-25 13:43:26 -03:00 |
|
Klaus
|
22d80b605f
|
Fix presenter assign
|
2017-07-25 13:21:07 -03:00 |
|
Klaus
|
b2556695c4
|
Fix show public messages
|
2017-07-19 14:57:07 -03:00 |
|
Oswaldo Acauan
|
a0de0545b4
|
Fix welcomeMessage from meeting object
|
2017-07-18 10:31:00 -03:00 |
|
Oswaldo Acauan
|
c6f517b3cb
|
Fix selector and get welcomeMessage from meeting object
|
2017-07-18 10:25:11 -03:00 |
|
Klaus
|
b630fcd632
|
Fix presenter assign
|
2017-07-17 09:00:18 -03:00 |
|
Anton Georgiev
|
07ca5f5794
|
Merge pull request #4086 from oswaldoacauan/guest-policy
[HTML5] Guest Policy
|
2017-07-14 15:32:18 -04:00 |
|
Oswaldo Acauan
|
8c99b7e4bb
|
Fix cb pattern
|
2017-07-14 16:25:04 -03: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 |
|
Oswaldo Acauan
|
fe9ca6b0c8
|
Fix welcome message for guest users
|
2017-07-14 11:23:12 -03:00 |
|
Oswaldo Acauan
|
2e6ee550d2
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into guest-policy
|
2017-07-14 11:18:40 -03:00 |
|
Oswaldo Acauan
|
5353a3a80d
|
Add guest policy to html5
|
2017-07-14 11:18:07 -03:00 |
|
Klaus
|
c97ad780b5
|
Fix properties incorrect name
|
2017-07-13 13:55:05 -03:00 |
|
Klaus
|
54234cecac
|
Handling emoji messages
|
2017-07-13 10:15:42 -03:00 |
|
Klaus
|
898f7c97e3
|
Sending private message
|
2017-07-12 10:18:26 -03:00 |
|
Klaus
|
73f49bb46a
|
Sending public message
|
2017-07-12 09:42:16 -03:00 |
|
Klaus
|
9b32a4db2d
|
Remove 'nodeJSapp' stuff, is deprecated
|
2017-07-06 15:01:05 -03:00 |
|
Klaus
|
86d3e27d47
|
Merged info with anton's branch
|
2017-07-03 12:05:35 -03:00 |
|
Klaus
|
27a92698cc
|
Moved the meetingId to be last param
|
2017-06-29 10:09:11 -03:00 |
|
Anton Georgiev
|
3ab794cbdb
|
obtain meetingId outside handler
|
2017-06-28 16:04:41 -04:00 |
|
Klaus
|
aab51bdaed
|
Change import and remove console.err
|
2017-06-28 15:14:29 -03:00 |
|
Klaus
|
d3a50416cc
|
Merge remote-tracking branch 'anton/handle-messages' into html5-whiteboard-messages
|
2017-06-28 13:56:33 -03:00 |
|
Klaus
|
894fd70e68
|
Fix presenter assigned message handle
|
2017-06-28 13:44:11 -03:00 |
|
Anton Georgiev
|
d899a573a6
|
Merge branch 'html5-whiteboard-messages' of github.com:Klauswk/bigbluebutton into handle-messages
|
2017-06-28 11:37:54 -04:00 |
|
Anton Georgiev
|
e0a5fa48f4
|
add default webcam_stream and adjust emoji
|
2017-06-28 11:33:03 -04:00 |
|
Anton Georgiev
|
724e21a0d6
|
we do not have 1.0 user messages coming from bbb so use 2.0 only
|
2017-06-27 18:14:53 -04:00 |
|
Klaus
|
c90d94d5ac
|
Handle presenterAssigned and emojiStatus
|
2017-06-27 09:40:28 -03:00 |
|
Klaus
|
e9d13e3b1e
|
A few fixes
|
2017-06-26 13:15:28 -03:00 |
|
Klaus
|
43cdd9754c
|
Fix imports
|
2017-06-22 08:48:10 -03:00 |
|
Klaus
|
692de9f417
|
Handle a few new messages
|
2017-06-21 13:54:04 -03:00 |
|
Klaus
|
3998139e72
|
Split redis and api for version migration
|
2017-06-20 14:17:37 -03:00 |
|
Klaus Klein
|
d88d4fb0bc
|
Add stuff from 2.x
|
2017-06-19 10:13:35 -03:00 |
|