Commit Graph

16918 Commits

Author SHA1 Message Date
Richard Alam
426051ed0c - minimize logging noise 2017-07-13 08:25:32 -07:00
perroned
dc658b244f Adds logs to LOGGER 2017-07-13 11:18:38 -04:00
Richard Alam
a3c7e36f7c - modify scripts to drag in new jar dependencies 2017-07-13 07:59:21 -07:00
Klaus
05e1951ac1 Use flat object instead of long properties 2017-07-13 10:56:28 -03:00
Klaus
54234cecac Handling emoji messages 2017-07-13 10:15:42 -03:00
Anton Georgiev
1687dc7281 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs 2017-07-12 19:43:38 -04:00
Anton Georgiev
d33c1b03ae handle DestroyMeetingSysCmdMsg on akka-apps 2017-07-12 19:21:01 -04:00
Richard Alam
1fe026b9ee - try to startup red5 with screenshare finding application.conf 2017-07-12 14:52:49 -07:00
Klaus
f0e26c1bbb Change missing strings to const 2017-07-12 17:22:26 -03:00
Klaus
111ad9171b Remove strings and add constants 2017-07-12 17:15:50 -03:00
Klaus
8cd4b752ef Remove strings and add constants 2017-07-12 17:02:55 -03:00
Klaus
2aa603d195 Merge branch 'bbb-2x-mconf' into html5-2x-chat-messages 2017-07-12 16:29:07 -03:00
perroned
2801709dcb Adds some WebRTC Screenshare logging 2017-07-12 15:27:44 -04:00
Anton Georgiev
0cdda4f8cb Merge pull request #4076 from Klauswk/fix-redis2x
[HTML5 2.0] Fix join on the html5 client
2017-07-12 15:17:32 -04:00
Richard Alam
da8baf2a32 Merge pull request #4075 from ritzalam/remove-old-pubsub
removing old pubsub
2017-07-12 14:54:52 -04:00
Richard Alam
f2c7826772 - removing old pubsub 2017-07-12 11:52:46 -07:00
Klaus
1dfb054323 A few hotfixes to make the html5 client join again 2017-07-12 15:51:29 -03:00
Richard Alam
8d1b36cd48 Merge pull request #4074 from perroned/update-verto-libs-add-ff
Update verto libs add firefox screenshare support
2017-07-12 14:28:13 -04:00
Richard Alam
6409bd9f18 Merge pull request #4073 from ritzalam/change-deskshare-to-screenshare
try renaming deskshare to screenshare
2017-07-12 13:52:39 -04:00
Richard Alam
d48f46c5e7 - try renaming deskshare to screenshare 2017-07-12 10:50:27 -07:00
Klaus
eb5712e96c Fix chat list 2017-07-12 13:47:58 -03:00
Richard Alam
002e3e8988 Merge pull request #4072 from perroned/verto-js-ds-screenshare
JavaScript DESKSHARE -> SCREENSHARE
2017-07-12 11:34:56 -04:00
perroned
f3f877057a Verto extension deskshare -> screenshare 2017-07-12 11:33:02 -04:00
Richard Alam
dbd855c402 Merge pull request #4071 from ritzalam/change-deskshare-to-screenshare
- change DESKSHARE to SCREENSHARE
2017-07-12 10:45:07 -04:00
Richard Alam
269d00791b - change DESKSHARE to SCREENSHARE 2017-07-12 07:43:44 -07:00
Klaus
e1004b64d3 Filtering correct the messages 2017-07-12 10:54:54 -03:00
Klaus
898f7c97e3 Sending private message 2017-07-12 10:18:26 -03:00
Klaus
e19ea05a75 Remove 'this.window', break the client 2017-07-12 09:59:51 -03:00
Klaus
73f49bb46a Sending public message 2017-07-12 09:42:16 -03:00
Richard Alam
35dc1c9314 Merge branch 'ritzalam-fs-webrtc-screenshare' into bbb-2x-mconf 2017-07-11 17:29:58 -07:00
Richard Alam
f1bfac77f4 - put back to http and ip for values in bbb.properties 2017-07-11 17:29:09 -07:00
Richard Alam
19e98b22f5 Merge branch 'fs-webrtc-screenshare' of https://github.com/ritzalam/bigbluebutton into ritzalam-fs-webrtc-screenshare 2017-07-11 17:08:38 -07:00
Richard Alam
f37b02b78c Merge pull request #4070 from ritzalam/antobinary-implement-bbb-web-msgs-2
Antobinary implement bbb web msgs 2
2017-07-11 20:06:25 -04:00
Richard Alam
0d427f9341 - add close connection message 2017-07-11 14:58:59 -07:00
Klaus
188aff42df Sending message, need to fix the property names 2017-07-11 17:44:07 -03:00
Richard Alam
b04519ef0f FreeSWITCH webrtc screenshare
- use webrtc screenshare using FS Verto
 - publish screenshare as rtmp to red5
 - flash clients view screenshare from red5 rtmp

 Fix mute/unmute/talking of user in voice conference
2017-07-11 13:31:56 -07:00
Anton Georgiev
422f930bb8 switch connId to userId for red5 system messages 2017-07-11 16:19:48 -04:00
Anton Georgiev
f6ef0ddf75 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs 2017-07-11 15:35:17 -04:00
Anton Georgiev
199af1773b send userLeave on user eject 2017-07-11 15:25:51 -04:00
Anton Georgiev
c5ca6a2fcc red5 closes connection when user is ejected 2017-07-11 14:56:35 -04:00
Klaus
55a9c0673e Handling chat messages 2017-07-11 13:57:54 -03:00
perroned
ecbc290436 Adds FF SS support 2017-07-11 12:24:50 -04:00
Richard Alam
68034fa6d8 Merge branch 'antobinary-implement-bbb-web-msgs' into bbb-2x-mconf 2017-07-11 08:13:07 -07:00
Richard Alam
02d9c6717b Merge branch 'implement-bbb-web-msgs' of https://github.com/antobinary/bigbluebutton into antobinary-implement-bbb-web-msgs 2017-07-11 08:12:18 -07:00
perroned
a1554c0176 Updates verto lib 2017-07-11 10:59:32 -04:00
Richard Alam
0b21c6d047 Merge branch 'capilkey-add-deskshare-handlers' into bbb-2x-mconf 2017-07-10 19:21:44 -07:00
Richard Alam
40d00282f5 - send deskshare messages from fsesl 2017-07-10 19:17:51 -07:00
Richard Alam
e425c657c6 Merge branch 'add-deskshare-handlers' of https://github.com/capilkey/bigbluebutton into capilkey-add-deskshare-handlers 2017-07-10 17:21:51 -07:00
Chad Pilkey
f6d92e5a50 add deskshare msg handlers to akka-apps 2017-07-10 18:12:06 -04:00
Richard Alam
38d2803dcc Merge pull request #4065 from ritzalam/update-commons-msg-version
- update dependency to bbb-commons-message 0.19-SNAPSHOT
2017-07-10 17:38:17 -04:00