BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,847 Commits 13 Branches 260 Tags 1.1 GiB
f2eebff87f
Commit Graph

16847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
f2eebff87f - init test data properly 2017-07-13 19:32:58 -07:00
Richard Alam
e7d1bd6a26 - make outgwbus replaceable for testing 2017-07-13 14:55:58 -07:00
Richard Alam
a7efe5364c - webrtc map shouldn't handle jws events 2017-07-13 08:25:49 -07:00
Richard Alam
426051ed0c - minimize logging noise 2017-07-13 08:25:32 -07:00
Richard Alam
a3c7e36f7c - modify scripts to drag in new jar dependencies 2017-07-13 07:59:21 -07:00
Richard Alam
1fe026b9ee - try to startup red5 with screenshare finding application.conf 2017-07-12 14:52:49 -07: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
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
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
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
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
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
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
Richard Alam
4eafa2d014 - update dependency to bbb-commons-message 0.19-SNAPSHOT 2017-07-10 14:36:59 -07:00
Anton Georgiev
c810c2cf73 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs 2017-07-10 17:26:04 -04:00
Anton Georgiev
23afd3fa95 Merge branch 'bbb-apps-sysmsg-routing' of github.com:capilkey/bigbluebutton into implement-bbb-web-msgs 2017-07-10 16:50:51 -04:00
Chad Pilkey
bc82b0bc9a add system message routing to bbb-apps-common 2017-07-10 16:41:01 -04:00
Anton Georgiev
797b2904aa handle eject user from meeting (a.k.a. kick) 2017-07-10 15:36:26 -04:00
Richard Alam
72f274434a Merge pull request #4063 from perroned/webrtc-utils 
Webrtc 2.0
 2017-07-10 13:33:44 -04:00
perroned
c13cb35c2b Cleans up 2017-07-10 12:03:01 -04:00
Richard Alam
2cf5679e3e Merge pull request #4062 from ritzalam/implement-emoji-message 
- start implementing lock settings
 2017-07-10 10:34:57 -04:00
Richard Alam
7a7712d986 - start implementing lock settings 2017-07-09 15:00:13 -07:00
perroned
03a97fef46 Cleans up -> StringUtils 2017-07-09 14:43:20 -04:00
perroned
020df250a6 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into webrtc-utils 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/ScreenshareEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/WebRTCDeskshareEventMap.mxml
 2017-07-09 14:39:57 -04:00
Anton Georgiev
0e9dcee399 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs 2017-07-09 11:09:23 -04:00
Richard Alam
2e3d9e1bda Merge pull request #4061 from ritzalam/implement-emoji-message 
- implement emoji status message
 2017-07-09 10:56:03 -04:00
Richard Alam
8d91ef8132 - convert several old client messages to new ones 2017-07-09 07:44:29 -07:00
Anton Georgiev
35b87ee069 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs 2017-07-09 10:37:34 -04:00
Anton Georgiev
900518fb1b cleanup 2017-07-09 10:26:55 -04:00
Richard Alam
5dbb8d5515 - implement emoji status message 2017-07-08 13:39:41 -07:00