Klaus
|
4495c2e897
|
Move from annotation/ to annotations/
|
2017-08-02 16:52:13 -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
|
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 |
|
Anton Georgiev
|
7b40122c89
|
Merge pull request #4121 from mmarangoni/call-manager
[HTML5] Implemented AudioManager
|
2017-07-31 14:29:42 -04:00 |
|
Klaus
|
9bc9116e5c
|
handling a few messages
|
2017-07-31 08:10:52 -03:00 |
|
Klaus
|
c13155aa6a
|
Move shapes to annotations
|
2017-07-27 09:35:55 -03:00 |
|
Matthew Marangoni
|
7c0d802f27
|
fixed undefined extension
|
2017-07-26 10:58:39 -07:00 |
|
Klaus
|
9ab4430f68
|
Fix merge stuff
|
2017-07-26 11:31:35 -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 |
|
Matthew Marangoni
|
2f48cca53e
|
Merge branch 'call-manager-2x' of https://github.com/Klauswk/bigbluebutton into Klauswk-call-manager-2x
|
2017-07-24 12:14:18 -07:00 |
|
Matthew Marangoni
|
8902742573
|
wrapped BBB instantiation into init function and added to startup
|
2017-07-24 11:36:56 -07:00 |
|
Klaus
|
d72df301c6
|
Move to 2.0
|
2017-07-24 11:15:46 -03:00 |
|
Klaus
|
5c2369b992
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into call-manager
|
2017-07-24 11:00:30 -03:00 |
|
Matthew Marangoni
|
4e66ecf0e2
|
moved BBB import to startup
|
2017-07-20 08:57:12 -07: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
|
5767583a86
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-captions-messages
|
2017-07-17 15:37:06 -03:00 |
|
Klaus
|
7fb9bae75e
|
Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages
|
2017-07-14 14:44:00 -03:00 |
|
Klaus
|
baf36d9d5f
|
Fix the html5 2.0 user logout
|
2017-07-14 13:59:02 -03:00 |
|
Klauswk
|
38087a1669
|
Merge branch 'bbb-2x-mconf' into html5-breakout-messages
|
2017-07-13 17:38:54 -03:00 |
|
Klaus
|
963248163d
|
Merge branch 'bbb-2x-mconf' into html5-breakout-messages
|
2017-07-13 17:14:02 -03:00 |
|
Klaus
|
55a9c0673e
|
Handling chat messages
|
2017-07-11 13:57:54 -03:00 |
|
Klaus
|
90ca216507
|
Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages
|
2017-07-07 08:19:39 -03:00 |
|
Klaus
|
4c1c7ad65a
|
Merge branch 'bbb-2x-mconf' into html5-2x-captions-messages
|
2017-07-06 17:36:56 -03:00 |
|
Anton Georgiev
|
83e14e8206
|
handle slides messages
|
2017-06-30 15:16:00 -04:00 |
|
Klaus
|
9b63e0c215
|
Add caption messages
|
2017-06-29 17:22:09 -03:00 |
|
Klaus
|
93927a3b53
|
Merge remote-tracking branch 'anton/handle-messages' into html5-2x-polls-messages
|
2017-06-29 09:22:34 -03:00 |
|
Klaus
|
2098c2dff7
|
Handle polls messages
|
2017-06-28 17:37:45 -03:00 |
|
Anton Georgiev
|
91cfc02d13
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into handle-messages
|
2017-06-26 17:21:42 -04:00 |
|
Klaus
|
c491d28b78
|
Handle most of the breakout messages
|
2017-06-26 15:00:28 -03:00 |
|
Klaus
|
a209f620e0
|
Add cursor support
|
2017-06-22 10:22:34 -03:00 |
|
Klaus
|
0c596c304d
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into SplitRedis
|
2017-06-20 14:16:16 -03:00 |
|
Anton Georgiev
|
367b905ec5
|
use enter api to get meetingId, authToken, etc
|
2017-06-19 14:03:12 -04:00 |
|
Anton Georgiev
|
8e16114c3f
|
html5client login now redirect=true to url+sessionToken
|
2017-06-19 14:01:24 -04:00 |
|
Klaus Klein
|
68f52aa107
|
Remove error from http response
|
2017-06-08 14:29:35 -03:00 |
|
Klaus Klein
|
e7e1243fef
|
Add const to defaultLang
|
2017-06-06 09:43:57 -03:00 |
|
Klaus Klein
|
0d9525164f
|
Add support to default system/browser language
|
2017-06-06 09:33:53 -03:00 |
|
Oswaldo Acauan
|
1c5c74db67
|
Fix merge conflicts
|
2017-06-05 13:52:46 +00:00 |
|
Oleksandr Zhurbenko
|
06493fda7f
|
Switched to prop-types package to remove new React 15 warnings
|
2017-06-03 19:40:14 -07:00 |
|
Oswaldo Acauan
|
e6412275a6
|
Linter auto fix
|
2017-06-02 19:25:02 +00:00 |
|
KDSBrowne
|
159a47694e
|
add suggested changes
|
2017-05-18 16:16:17 -07:00 |
|
KDSBrowne
|
d1543584ba
|
change file permission to 644
|
2017-05-17 09:07:41 -07:00 |
|
KDSBrowne
|
f4d6f173ea
|
fix new lint issues
|
2017-05-17 09:02:13 -07:00 |
|
KDSBrowne
|
16e507fbb2
|
fix merge conflicts
|
2017-05-17 08:54:48 -07:00 |
|
KDSBrowne
|
df76d33cba
|
set files permission to 644
|
2017-05-16 09:22:59 -07:00 |
|
KDSBrowne
|
6537a0e28c
|
Fix client lint issues except those which are comment related
|
2017-05-16 08:37:17 -07:00 |
|
Klaus Klein
|
2b53dd19e5
|
Code refactored
|
2017-05-15 16:45:00 -03:00 |
|
Klaus Klein
|
95b47fd54a
|
Fix lang fallback error
|
2017-05-15 13:32:41 -03:00 |
|