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

20066 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Dixon
59aba69c7c Bump the copyright date 2018-04-25 19:13:44 -05:00
Richard Alam
5d294d72bf
Merge pull request #5410 from ritzalam/improve-client-logging 
- log browser info
 2018-04-25 19:47:28 -04:00
Richard Alam
55b5e1fc66 - log browser info 2018-04-25 16:45:06 -07:00
Fred Dixon
8f960dc960
Merge pull request #5409 from ffdixon/fix-ws-kurento 
Fix kurentoUrl so it has ws
 2018-04-25 19:24:13 -04:00
Fred Dixon
f004cf7398 Fix kurentoUrl so it has ws 2018-04-25 18:22:14 -05:00
Richard Alam
d07bfec2f1
Merge pull request #5408 from ritzalam/improve-client-logging 
- add client connId to client logs so we can correlate client conn l…
 2018-04-25 19:03:29 -04:00
Richard Alam
d740e36435 - add client connId to client logs so we can correlate client conn logs with red5 side conn logs 2018-04-25 16:00:06 -07:00
prlanzarin
1adc09660f Fixed hanging processes in bbb-webrtc-sfu 2018-04-25 22:43:33 +00:00
prlanzarin
28950edf3b Removed ICE error toast message 2018-04-25 22:14:59 +00:00
Anton Georgiev
44fde9a83c
Merge pull request #5400 from MaximKhlobystov/whiteboard-bulk-upsert 
[HTML5 Client] Whiteboard Bulk Operations
 2018-04-25 18:03:52 -04:00
Anton Georgiev
f635069f23
Merge pull request #5406 from bigbluebutton/fixed-loading-rotation 
Loading screen rotation spins counter-clockwise
 2018-04-25 17:29:50 -04:00
BobakOftadeh
8e50a232c7
Loading screen rotation spins counter-clockwise 
The arrows for when a webcam is loading now correctly spins counter-clockwise.
 2018-04-25 17:02:36 -04:00
Lucas Fialho Zawacki
f47737f7f5 Have html5 recordings as disabled in the example config file 2018-04-25 20:28:40 +00:00
Richard Alam
28b83d23ff
Merge pull request #5343 from ritzalam/add-more-info-on-feedback 
- add reason, role, external user id on feedback info when client lo…
 2018-04-25 16:15:17 -04:00
Richard Alam
44a3cc96cd
Merge pull request #5403 from riadvice/v2.0.x-webcams-late-joiners 
Fix video display for webcamsOnlyForModerator
 2018-04-25 16:14:35 -04:00
Maxim Khlobystov
8e2cfce7ff Improved the error logging when doing bulkWrite. 2018-04-25 20:14:27 +00:00
Lucas Fialho Zawacki
80562ac25c Merge branch 'webrtc-webcams' of https://github.com/kepstin/bigbluebutton into html5-video-recording 2018-04-25 20:02:45 +00:00
Calvin Walton
bfcaa5aaa3 Check for new webrtc deskshare event in presentation slide code 2018-04-25 16:00:13 -04:00
Ghazi Triki
f430f363af Fix role change and page reload not taking in account webcam display when webcamsOnlyForModerator is on? 2018-04-25 20:56:57 +01:00
prlanzarin
fd40540464 Fixed event emitter leak in screenshare transcoder handling 2018-04-25 19:14:30 +00:00
Calvin Walton
954ee4fc18 Events code doesn't know where archive dir is 2018-04-25 15:08:35 -04:00
Calvin Walton
9ada59d1c4 Fix more variable references in screenshare events 2018-04-25 15:04:01 -04:00
prlanzarin
94801ddc3d Fixed MediaSession stop routine and status 2018-04-25 18:59:36 +00:00
Lucas Fialho Zawacki
419adcf926 Merge branch 'webrtc-webcams' of https://github.com/kepstin/bigbluebutton into html5-video-recording 2018-04-25 18:30:43 +00:00
Calvin Walton
cd3e28a08c Fix some errors in screenshare archive/sanity 2018-04-25 14:28:37 -04:00
Anton Georgiev
45dc263fdf
Merge pull request #5382 from jfsiebel/audio-settings-retry 
Add friendly iteration on audio settings retry
 2018-04-25 14:01:21 -04:00
Anton Georgiev
f99897bf89
Merge pull request #5393 from antobinary/meta-params 
Add JSP for HTML5 Video Chat
 2018-04-25 13:39:32 -04:00
Anton Georgiev
e5d4f601b2
Merge pull request #5383 from oswaldoacauan/meta-params-video-conf 
Add meta params for auto share the webcam, auto swap the layout and disable presentation.
 2018-04-25 13:36:27 -04:00
prlanzarin
5059ccdce6 Merge remote-tracking branch 'upstream/v2.0.x-release' into screenshare-opt2 2018-04-25 16:57:02 +00:00
prlanzarin
4cb7dcab7c Refactored WebRTC screenshare flow and fixed mcs-core event emission 2018-04-25 16:56:16 +00:00
Maxim Khlobystov
9ce70e77dd Reverted the exposing of the Mongo Annotations collection on the client side. 2018-04-25 16:21:52 +00:00
Lucas Fialho Zawacki
c0b3003918 Merge branch 'webrtc-webcams' of https://github.com/kepstin/bigbluebutton into html5-video-recording 2018-04-25 16:02:30 +00:00
Calvin Walton
ca0156d423 Support WebRTC screenshare in get events functions 2018-04-25 11:55:02 -04:00
Calvin Walton
39e981a7f2 Include webrtc screenshare streams in edl for video rendering 2018-04-25 11:44:23 -04:00
Calvin Walton
9f528e37fe Archive kurento screenshare streams 2018-04-25 11:35:36 -04:00
Lucas Fialho Zawacki
cc8385011a Slightly different naming scheme for kurento recordings 2018-04-25 15:29:51 +00:00
Anton Georgiev
a2e5620ac4
Merge pull request #5374 from KDSBrowne/xx.02.fix.5370 
Prevent client breaking when settings are saved while userlist is-open
 2018-04-25 11:22:30 -04:00
Anton Georgiev
768a8733eb
Merge pull request #5386 from jfsiebel/fix-direct-message-problem 
Fix private chat messages
 2018-04-25 11:18:37 -04:00
Lucas Fialho Zawacki
e4a14011da Send a screenshare stop event directly from bbb-webrtc-sfu 2018-04-25 15:17:46 +00:00
Maxim Khlobystov
4db94b4489 Some cleanup and code optimizations. 2018-04-25 15:15:36 +00:00
Maxim Khlobystov
fd0c1bf164 Fixed a small misprint in DRAW_END logic. 2018-04-25 14:52:03 +00:00
Maxim Khlobystov
4067f5f808 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into whiteboard-bulk-upsert 2018-04-25 14:39:48 +00:00
Lucas Fialho Zawacki
8f1a128e24 Send webrtc screenshare event for recordings 2018-04-25 14:36:37 +00:00
João Francisco Siebel
9e2d517052 add user verification and narrow down search 2018-04-25 11:29:55 -03:00
Maxim Khlobystov
8d1e80fbf0 Put the bulk lifespan value into configs. 2018-04-25 14:27:53 +00:00
Oswaldo Acauan
fb6aeb90f9 Fix autosharewebcam option not working on first join 2018-04-25 11:23:44 -03:00
Anton Georgiev
e930372a74 add client type as parameter in bbb api 2018-04-24 22:53:49 +00:00
Lucas Fialho Zawacki
1fa4b958bf Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into html5-video-recording 2018-04-24 22:49:50 +00:00
Lucas Fialho Zawacki
5c40eb1651 Yet another step in adding html5 recording messages into redis 2018-04-24 22:49:16 +00:00
Richard Alam
bfd7738831 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into v2.0.x-release 2018-04-24 15:06:33 -07:00