Commit Graph

44 Commits

Author SHA1 Message Date
KDSBrowne
d89f0e511f Merge branch 'v2.0.x-release' into xx-07-allow-html5-modorator 2017-10-06 11:02:17 -07:00
KDSBrowne
b20ab84abd make changeRole.js return publishUserMessage 2017-10-06 06:31:56 -07:00
Anton Georgiev
6b1a29eab4 Merge pull request #4426 from OZhurbenko/presenter-functionality-2x
HTML5 - Whiteboard/Presentation fixes, improvements, refactoring
2017-10-04 14:05:03 -04:00
Oleksandr Zhurbenko
ab95c87f48 Fixed wb toolbar console warnings cause by improper props validation 2017-10-03 14:28:44 -07:00
KDSBrowne
83d4474b51 remove if statment and unused imports 2017-10-03 13:03:18 -07:00
KDSBrowne
078e8b579a remove Logger messages and switch allowHTML5Moderator to false 2017-10-03 12:38:59 -07:00
KDSBrowne
af4676ea38 pass userId to publishUserMessage 2017-10-03 12:20:03 -07:00
KDSBrowne
2d62b79165 switch to correct event name 2017-10-03 12:12:19 -07:00
KDSBrowne
9bad8d8d5d add kickVoiceUser and fix presenter assign bug 2017-10-03 08:25:56 -07:00
KDSBrowne
bc0647ad50 fix merge conflicts 2017-09-29 12:04:27 -07:00
KDSBrowne
a60b7e26a6 add kickUser method 2017-09-28 10:41:02 -07:00
Klaus
4d51e0c045 Fix unsplited styles and code duplicated 2017-09-22 11:24:24 -03:00
Klaus
29922c896a Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-refactor-userlist 2017-09-21 15:40:18 -03:00
Anton Georgiev
e22da926bb Merge pull request #4414 from KDSBrowne/x2.0.8-stun-turn-delete
[HTML5] - Remove requestStunTurn
2017-09-19 15:53:08 -04:00
KDSBrowne
4388fc4b0f remove requestStunTurn 2017-09-19 08:42:10 -07:00
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
JaeeunCho
73b6054b42 [HTML5] implemented promote/demote user 2017-08-18 11:23:05 -07:00
Klaus
d45ae64558 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x 2017-08-02 11:29:33 -03:00
Klaus
0a9abf6273 Remove user.listenOnly 2017-08-01 14:02:41 -03:00
Oswaldo Acauan
f217304e19 Add publish to UserJoinMetting to the auth flow 2017-07-31 15:48:56 -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
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
Klaus
d4ffcc0221 Add assign presenter to html5 2017-07-17 09:49:11 -03:00
Klaus
baf36d9d5f Fix the html5 2.0 user logout 2017-07-14 13:59:02 -03:00
Klaus
54234cecac Handling emoji messages 2017-07-13 10:15:42 -03:00
Klaus
aab51bdaed Change import and remove console.err 2017-06-28 15:14:29 -03: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
43cdd9754c Fix imports 2017-06-22 08:48:10 -03:00
Klaus Klein
d88d4fb0bc Add stuff from 2.x 2017-06-19 10:13:35 -03:00