Oleksandr Zhurbenko
|
c9552247b2
|
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
|
2017-09-18 12:08:14 -07:00 |
|
KDSBrowne
|
4b7d790a57
|
change variable name
|
2017-09-12 11:13:27 -07:00 |
|
KDSBrowne
|
39bd590329
|
rework header creation
|
2017-09-12 08:52:02 -07:00 |
|
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 |
|
KDSBrowne
|
bc8718e263
|
fix line endidngs
|
2017-09-07 09:47:20 -07:00 |
|
KDSBrowne
|
21c5ffee8f
|
remove need for separate headerBuilder function
|
2017-09-07 09:37:13 -07:00 |
|
Oleksandr Zhurbenko
|
251bd22738
|
PR review fixes
|
2017-09-06 12:36:52 -07:00 |
|
KDSBrowne
|
67ab2d5379
|
alternate solution test
|
2017-09-06 07:17:46 -07:00 |
|
KDSBrowne
|
7cdf031a22
|
fix typo
|
2017-08-30 09:33:18 -07:00 |
|
KDSBrowne
|
f31a2df133
|
implement suggested changes
|
2017-08-30 09:31:08 -07:00 |
|
KDSBrowne
|
a8137c3054
|
switch to one function to create headers
|
2017-08-30 07:58:46 -07:00 |
|
KDSBrowne
|
92c9af6d96
|
add functions to create headers
|
2017-08-28 07:29:26 -07: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
|
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 |
|
Klaus
|
a0368e55cf
|
Fix voiceUser mic states
|
2017-08-02 10:11:53 -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
|
fc6713013a
|
Move method to VoiceUser
|
2017-08-01 12:00:07 -03:00 |
|
Klaus
|
9d42ca9bd7
|
Move from users to voice-users
|
2017-08-01 10:10:12 -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
|
355f777d0d
|
User mapped
|
2017-07-26 11:50:02 -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 |
|
Anton Georgiev
|
1bdeb248c1
|
Merge pull request #4117 from Klauswk/html5-2x-fix-audio
[HTML5 2.0] Fix join audio on the HTML5 client 2.0
|
2017-07-25 10:30:43 -04:00 |
|
Klaus
|
b2556695c4
|
Fix show public messages
|
2017-07-19 14:57:07 -03:00 |
|
Klaus
|
b70702dabe
|
Dynamic fetching the stun/turn servers
|
2017-07-19 09:44:47 -03:00 |
|
Klaus
|
a7ca723fe6
|
Audio only working on html5
|
2017-07-18 11:59:05 -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
|
d4ffcc0221
|
Add assign presenter to html5
|
2017-07-17 09:49: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 |
|
Klaus
|
baf36d9d5f
|
Fix the html5 2.0 user logout
|
2017-07-14 13:59:02 -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 |
|