Richard Alam
|
08fe6cea81
|
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into work-on-meeting-lifcycle
|
2017-07-14 07:25:31 -07:00 |
|
Oswaldo Acauan
|
fe9ca6b0c8
|
Fix welcome message for guest users
|
2017-07-14 11:23:12 -03:00 |
|
Oswaldo Acauan
|
2e6ee550d2
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into guest-policy
|
2017-07-14 11:18:40 -03:00 |
|
Oswaldo Acauan
|
5353a3a80d
|
Add guest policy to html5
|
2017-07-14 11:18:07 -03:00 |
|
Fred Dixon
|
17212d93ff
|
Update bigbluebutton-release
|
2017-07-14 10:14:06 -04:00 |
|
Richard Alam
|
f2eebff87f
|
- init test data properly
|
2017-07-13 19:32:58 -07:00 |
|
Richard Alam
|
4b9968efe6
|
Merge branch 'capilkey-convert-global-audio-messages' into bbb-2x-mconf
|
2017-07-13 18:17:28 -07:00 |
|
Richard Alam
|
4d12ed57fd
|
- remove log noise
|
2017-07-13 18:16:18 -07:00 |
|
Richard Alam
|
5bccf11319
|
Merge branch 'convert-global-audio-messages' of https://github.com/capilkey/bigbluebutton into capilkey-convert-global-audio-messages
|
2017-07-13 17:33:22 -07:00 |
|
Richard Alam
|
9ad2e37494
|
Merge branch 'antobinary-implement-bbb-web-msgs' into bbb-2x-mconf
|
2017-07-13 17:27:37 -07:00 |
|
Richard Alam
|
6e3d9acb06
|
Merge branch 'implement-bbb-web-msgs' of https://github.com/antobinary/bigbluebutton into antobinary-implement-bbb-web-msgs
|
2017-07-13 17:17:53 -07:00 |
|
Chad Pilkey
|
86da035674
|
move the global audio messages to the 2.0 format
|
2017-07-13 18:09:15 -04:00 |
|
Richard Alam
|
e7d1bd6a26
|
- make outgwbus replaceable for testing
|
2017-07-13 14:55:58 -07:00 |
|
Klauswk
|
38087a1669
|
Merge branch 'bbb-2x-mconf' into html5-breakout-messages
|
2017-07-13 17:38:54 -03:00 |
|
Klaus
|
82f383f4ae
|
Fix typo in createBreakout
|
2017-07-13 17:35:40 -03:00 |
|
Klaus
|
6c602ba56f
|
Add missing import and add FIX ME
|
2017-07-13 17:28:35 -03:00 |
|
Klaus
|
12f1254624
|
Fix missing merge in redis2x
|
2017-07-13 17:23:20 -03:00 |
|
Klaus
|
858076924c
|
Fix import problems
|
2017-07-13 17:21:27 -03:00 |
|
Klaus
|
963248163d
|
Merge branch 'bbb-2x-mconf' into html5-breakout-messages
|
2017-07-13 17:14:02 -03:00 |
|
Anton Georgiev
|
94807f5d1c
|
Merge pull request #4078 from Klauswk/html5-2x-chat-messages
[HTML5 2.0] Move chat messages to 2.0
|
2017-07-13 13:30:35 -04:00 |
|
Klaus
|
c97ad780b5
|
Fix properties incorrect name
|
2017-07-13 13:55:05 -03:00 |
|
Anton Georgiev
|
1fba3f0009
|
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs
|
2017-07-13 12:30:51 -04:00 |
|
Anton Georgiev
|
701ada98a8
|
unsubscribe from screenshare bus channel
|
2017-07-13 12:27:30 -04:00 |
|
Fred Dixon
|
795381d2ce
|
Merge pull request #4081 from ritzalam/update-jws-screenshare
Update jws screenshare
|
2017-07-13 12:12:16 -04:00 |
|
Anton Georgiev
|
3d420cf459
|
force disconnect for all users on meeting end
|
2017-07-13 11:58:16 -04: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 |
|
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 |
|