Klaus
d45ae64558
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x
2017-08-02 11:29:33 -03:00
Matthew Marangoni
2494f48f52
removed unused constructor
2017-07-31 13:54:18 -07:00
Anton Georgiev
7b40122c89
Merge pull request #4121 from mmarangoni/call-manager
...
[HTML5] Implemented AudioManager
2017-07-31 14:29:42 -04:00
Klauswk
e751bcdadf
Merge branch 'bbb-2x-mconf' into slides-refactor-2x
2017-07-27 17:27:35 -03:00
Matthew Marangoni
7c0d802f27
fixed undefined extension
2017-07-26 10:58:39 -07:00
Klaus
745b9070f6
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x
2017-07-26 11:11:40 -03:00
Anton Georgiev
75c39f9340
Merge branch 'html5-2x-screenshare' of github.com:antobinary/bigbluebutton into html5-2x-fix-audio
2017-07-24 16:06:52 -04:00
Anton Georgiev
b7d6427e63
rename deskshare to screenshare and adjust condition for viewing
2017-07-24 15:29:34 -04:00
Klaus
78a6fee038
Slides reflecting akkaApps
2017-07-24 14:50:44 -03:00
Klaus
5c2369b992
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into call-manager
2017-07-24 11:00:30 -03:00
Klaus
2bf0fc65db
Fix statment
2017-07-19 14:20:19 -03:00
Klaus
b70702dabe
Dynamic fetching the stun/turn servers
2017-07-19 09:44:47 -03:00
Klauswk
7173c0e20c
Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages
2017-07-17 16:54:37 -03:00
Klaus
3af281d648
Merge remote-tracking branch 'upstream/master' into merge-master-mconf
2017-07-17 13:33:45 -03:00
Klaus
7fb9bae75e
Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages
2017-07-14 14:44:00 -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
Klaus
54234cecac
Handling emoji messages
2017-07-13 10:15:42 -03:00
Klaus
55a9c0673e
Handling chat messages
2017-07-11 13:57:54 -03:00
Klaus
be2caf92a3
Working poll vote
2017-06-30 11:26:19 -03:00
Klaus Klein
ca09b69555
Merge branch 'Acl' into Refactor2x
...
* Acl:
Add check to undefined role
Lint to eslint
Missing merge file
Fix lint problems
Change Acl lookup
Change ACL to be more extensible
Fix a few review comments
Acl refactor working
Mostly working, still problems with user subs
Code refactored
2017-06-19 11:28:17 -03:00
Klaus Klein
c627deca36
Move api to api/1.1
2017-06-19 08:57:32 -03:00
