Commit Graph

21763 Commits

Author SHA1 Message Date
Anton Georgiev
3546e49379 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into breakouts-improvements-3 2018-06-20 16:02:06 +00:00
Anton Georgiev
7b8d568a54 fix redundant offer to join audio re breakouts 2018-06-20 15:36:26 +00:00
Richard Alam
6ec86567eb
Merge pull request #5719 from ritzalam/merge-reroute-client-msgs
Merge reroute client msgs
2018-06-20 10:33:57 -04:00
Richard Alam
37acdfcb1f
Merge pull request #5718 from ritzalam/merge-v20-branch
Merge v20 branch
2018-06-19 17:47:08 -04:00
Richard Alam
066395c440 - make configurable how client talks to server (default Red5) 2018-06-19 14:40:12 -07:00
Richard Alam
384fdb3e16 Merge branch 'reroute-client-messages' of github.com:ritzalam/bigbluebutton into merge-reroute-client-msgs 2018-06-19 14:28:24 -07:00
Lucas Fialho Zawacki
f2f649df73 Add MKV_VIDEO_ONLY profile to config.default.yml 2018-06-19 17:46:32 -03:00
Lucas Fialho Zawacki
a61d99afac Small corrections to screenshare recording 2018-06-19 17:36:42 -03:00
Lucas Fialho Zawacki
f5d0862f69 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into orientation-recording 2018-06-19 17:19:38 -03:00
Richard Alam
14327a1edf Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-v20-branch 2018-06-19 12:58:51 -07:00
Bobak Oftadeh
812e3f765a Use of apackage to detect device type 2018-06-19 10:58:20 -07:00
Lucas Fialho Zawacki
c93e2d8379 Update kurento-client-js to use new mkv api 2018-06-19 14:57:09 -03:00
Anton Georgiev
22616a132b reset isEchoTest so value is always correct 2018-06-19 15:40:19 +00:00
Anton Georgiev
634b7b34c7 avoid referencing null on user leave 2018-06-19 15:38:53 +00:00
Anton Georgiev
c8649b1e74 handle unmute required warning 2018-06-19 15:38:09 +00:00
Anton Georgiev
e541e68379
Merge pull request #5711 from Tainan404/issue-5690
skip share/unshare of flash webcams using "if" instead of "check".
2018-06-19 10:50:15 -04:00
Anton Georgiev
75ddc19013
Merge pull request #5683 from musickiper/vertically-align-rec-tag-with-sTitle
Vertically align recording tag with the session title
2018-06-19 10:04:00 -04:00
Anton Georgiev
eee7f64763
Merge pull request #5713 from musickiper/logChat-cause-resize-problem
Prevent long chat message to make the chat area of the client to be resized
2018-06-19 10:03:11 -04:00
KDSBrowne
55f61602f3 move permission overlay closer to browser prompt 2018-06-19 12:28:56 +00:00
Bobak Oftadeh
69a4de5ff2 Fullscreen button only gets added on Android 2018-06-18 13:23:20 -07:00
Tainan Felipe
2dbfe499cc rename variable 2018-06-18 15:59:35 -03:00
Tainan Felipe
9e9e85cddb skip share/unshare webcam using if not check 2018-06-18 15:35:27 -03:00
KDSBrowne
b497ac87af improve line readability / fix audio-modal title not being displayed 2018-06-18 17:01:45 +00:00
Richard Alam
ba56751546
Merge pull request #5682 from kepstin/bbb-20-rec-fixes
Recording processing fixes
2018-06-18 11:50:43 -04:00
Richard Alam
346a3a0fad
Merge pull request #5709 from ritzalam/fix-update-rec-meta-mult-formats
- update rec metadata for all formats
2018-06-18 11:49:57 -04:00
Richard Alam
39d786a2bd - update rec metadata for all formats 2018-06-18 08:46:10 -07:00
Anton Georgiev
30c67996a8
Merge pull request #5698 from antobinary/meta-params-html5
HTML5: Process only meta params from the list of the handled ones
2018-06-18 10:59:58 -04:00
Anton Georgiev
f703304557 only process handled meta params for html5 2018-06-18 14:47:55 +00:00
Anton Georgiev
2d7cc12603
Merge pull request #5669 from MaximKhlobystov/chat-counter
Chat counter and scrolling
2018-06-18 10:34:27 -04:00
Fred Dixon
2868aa5ce3
Merge pull request #5705 from ffdixon/bbb-conf-9
Added check for version of node and mongod
2018-06-16 16:33:04 -04:00
Fred Dixon
01b11ccebe Added check for version of node and mongod 2018-06-16 15:29:56 -05:00
Fred Dixon
7c8a86d4e9
Merge pull request #5704 from capilkey/adjust-ff60-upload-check
Adjust FF60 upload check
2018-06-15 18:17:45 -04:00
Chad Pilkey
3a40cf169d make the file upload check for ff60 more explicit 2018-06-15 15:01:17 -07:00
Anton Georgiev
ad483dd0e5
Merge pull request #5702 from Tainan404/issue-5692
Skip userLeaving when meeting is gone.
2018-06-15 16:26:04 -04:00
Tainan Felipe
d5482651d9 rename variable 2018-06-15 17:24:03 -03:00
Fred Dixon
381e4dd7c1
Merge pull request #5701 from pedrobmarin/webhooks-features-2.0
Webhooks features 2.0
2018-06-15 15:37:58 -04:00
Tainan Felipe
f86d80c53d Remove skip userLeaving and change throw to log 2018-06-15 16:28:19 -03:00
Tainan Felipe
3884d45e5d skip userLeaving when meeting is ended 2018-06-15 15:16:05 -03:00
Anton Georgiev
a6e6b5d467
Merge pull request #5699 from antobinary/locales-june-15
Pulled html5 locales on June 15, 2018
2018-06-15 13:38:39 -04:00
italo
24091b9fcb Fix multiple callback when creating permanent hooks 2018-06-15 14:33:17 -03:00
Anton Georgiev
6cee7545b2 pulled html5 locales on June 15, 2018 2018-06-15 16:24:35 +00:00
Anton Georgiev
7b9f02a2f6
Merge pull request #5694 from antobinary/improve-logs
Improve specific HTML5 logs
2018-06-15 12:20:22 -04:00
Anton Georgiev
c8eb8094d3 process only meta params starting with "html5" 2018-06-15 16:02:05 +00:00
Anton Georgiev
1fadde01dc
Merge pull request #5697 from MaximKhlobystov/chat-notifications-timing
Chat push notifications timing
2018-06-15 11:07:30 -04:00
Maxim Khlobystov
327f101657 Minor cleanup. 2018-06-15 14:37:57 +00:00
Maxim Khlobystov
ea81b8c203 Adjusted the interval between chat notifications and their lifetime. 2018-06-15 14:22:56 +00:00
JamesJung
0fa7810e34 Add userName to the log sent from client to server (#5535)
Fix for #5454
2018-06-15 09:45:58 -03:00
Anton Georgiev
7338086572 Do not auth validate Flash users (#5695)
by @oswaldoacauan
2018-06-14 17:24:55 -03:00
Anton Georgiev
3b5860b686
Merge pull request #5693 from Tainan404/issue-5560
Remove cursor when user leaves the meeting.
2018-06-14 16:11:16 -04:00
Tainan Felipe
a47fe7bdbc remove event listeners 2018-06-14 16:36:22 -03:00