BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,484 Commits 13 Branches 260 Tags 1.1 GiB
2faa49d8f0
Commit Graph

22484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
KDSBrowne
7fc967f858 add new line to EOF 2018-06-13 16:40:29 +00:00
KDSBrowne
4fa9e745b2 Merge remote-tracking branch 'upstream/v2.0.x-release' into xx.add.Edge-support-html5 2018-06-13 16:30:14 +00:00
KDSBrowne
c93ef2b702 add _indicators mixin 2018-06-13 16:27:30 +00:00
Calvin Walton
c97f0cb33a RaP: Calculate video area sizes using aspect ratio 
The previous calculation used the video size in pixels, which might lead
to stretched/squashed videos in rare cases where the video has non-square
pixels. The new calculation is correct for all video sizes.
 2018-06-13 11:18:54 -04:00
Calvin Walton
9c3faf2830 RaP: Fix video start_time checking 
The video_info function returns the start time already in milliseconds,
so compare against 1ms instead of 1/1000.
 2018-06-13 11:18:54 -04:00
Calvin Walton
6388e55209 RaP: Support ffmpeg 4.0 in video processing scripts 
The ffprobe command in ffmpeg 4.0 now omits the aspect ratio fields in the
json output when indeterminate, instead of returning an invalid value with
0 in the numerator or denominator. Handle this correctly.
 2018-06-13 11:18:54 -04:00
Ghazi Triki
809c8c68c7 Update Main-app.xml EOL 2018-06-13 16:01:29 +01:00
Anton Georgiev
103f94068c
Merge pull request #5679 from Tainan404/filled-star 
Add filled star in feedback rating
 2018-06-13 09:10:05 -04:00
Ghazi Triki
0a402cdc9f Correctly attach and detach streaming image with IOSVideoView. 2018-06-13 12:19:32 +01:00
Tainan Felipe
aaebcd8f10 add filled star in feedback rating 2018-06-12 16:53:17 -03:00
Anton Georgiev
4fcc913855 stop showing breakout time in document.title 2018-06-12 19:50:58 +00:00
Maxim Khlobystov
304582b9ec Passing scrollArea ref instead of its getter. 2018-06-12 19:47:51 +00:00
Tainan Felipe
46807039a4 add a small style for toast notification and add a content prop in toast 2018-06-12 14:21:31 -03:00
Maxim Khlobystov
49243d9170 Fixed the chat counter and how it reacts on scrolling in the chat. 2018-06-12 17:03:13 +00:00
Ghazi Triki
393919feb0
Merge pull request #3 from jfsiebel/bbb-rtmp-player-ios 
Add BBBRtmpPlayer ANE
 2018-06-12 15:50:01 +01:00
Anton Georgiev
3b3f49d77a
Merge pull request #5636 from prlanzarin/error-handling-sfu 
SFU improvements for high load scenarios
 2018-06-12 10:19:47 -04:00
Anton Georgiev
60e7c5074e
Merge pull request #5666 from antobinary/lime 
Pulled html5 client locales June 12, 2018
 2018-06-12 09:47:28 -04:00
Anton Georgiev
942f0f1ae0 pulled html5 client locales June 12, 2018 2018-06-12 13:45:14 +00:00
KDSBrowne
7b739a9163 swap browser / os checks done by deviceInfo in favor of detect-browser 2018-06-11 23:12:43 +00:00
Maxim Khlobystov
5a6f5b6f7a
Merge pull request #5664 from antobinary/turns-stuns 
Pass correct structure for TURNs
 2018-06-11 16:54:16 -04:00
KDSBrowne
73dcf31f24 use noop included in lodash 2018-06-11 20:30:15 +00:00
Anton Georgiev
f38271b3f8 pass correct structure for TURNs 2018-06-11 20:20:32 +00:00
James Jung
855d22fe00 Prevent long chat message to make the chat area of the client to be resized 2018-06-11 15:57:17 -04:00
Richard Alam
f8f20f9ad6 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into v2.0.x-release 2018-06-11 10:50:30 -07:00
Richard Alam
a8bab253db Merge branch 'riadvice-recording-message' into v2.0.x-release 2018-06-11 10:50:00 -07:00
Ghazi Triki
718d65f30b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into recording-message 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/main/views/RecordWindow.mxml
 2018-06-11 18:33:27 +01:00
Anton Georgiev
338ab210b8
Merge pull request #5663 from antobinary/breakouts-improvements-2 
Breakouts improvements in HTML5
 2018-06-11 13:32:28 -04:00
Richard Alam
9e623fded8
Merge pull request #5662 from ritzalam/deploy-scripts 
- some dev scripts to build bbb-voice and bbb-video
 2018-06-11 13:17:58 -04:00
Richard Alam
1de74a6153 Merge branch 'riadvice-global-exception-catcher' into v2.0.x-release 2018-06-11 10:13:01 -07:00
Anton Georgiev
e2138e6d3d cleanup 2018-06-11 16:10:03 +00:00
Anton Georgiev
de7977122c fix incorrectly picked breakout expiration time 2018-06-11 16:05:53 +00:00
Anton Georgiev
827eb7425e Meeting expiration was picked before breakout exp 
resulting in keeping of the client tab open at end-of-meeting page
 2018-06-11 16:05:53 +00:00
Anton Georgiev
fd563c2577 make default breakouts expiration time 15 mins, not 15 sec 2018-06-11 16:05:53 +00:00
Richard Alam
f7f291e70e Merge branch 'global-exception-catcher' of https://github.com/riadvice/bigbluebutton into riadvice-global-exception-catcher 2018-06-11 08:52:08 -07:00
Richard Alam
fb6302fb79 Merge branch 'riadvice-popups-style' into v2.0.x-release 2018-06-11 08:50:59 -07:00
Richard Alam
9c776579c4 Merge branch 'popups-style' of https://github.com/riadvice/bigbluebutton into riadvice-popups-style 2018-06-11 08:33:52 -07:00
Richard Alam
fd652e84e0 - some dev scripts to build bbb-voice and bbb-video 2018-06-11 08:31:41 -07:00
João Francisco Siebel
07e723a904 Add BBBRtmpPlayer ANE 2018-06-11 11:49:52 -03:00
Richard Alam
f3c4a2da48
Merge pull request #5661 from ritzalam/21-and-20-merge-working-branch 
Fix some compile errors
 2018-06-11 10:34:10 -04:00
Richard Alam
fc161ce839 - fix compile issue 2018-06-11 07:31:54 -07:00
Richard Alam
9e864d4fd6 - fix compile error 2018-06-11 07:24:29 -07:00
Fred Dixon
2d27fd52cc
Merge pull request #5655 from riadvice/haitian-locale 
Add Haitian locale to flash client
 2018-06-11 10:10:47 -04:00
Ghazi Triki
9b274dd1f8 Fix locale Haitian Creole name. 2018-06-11 15:09:43 +01:00
Ghazi Triki
e5e0bdcd21 Switch LogoutWindow confirmation buttons order. 2018-06-11 15:04:48 +01:00
Ghazi Triki
fd91ed72e1 Fixed locale typo. 2018-06-11 11:29:24 +01:00
Richard Alam
dc62b89691 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 2018-06-08 17:49:13 -07:00
Richard Alam
83ac942452 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 2018-06-08 17:23:49 -07:00
Ghazi Triki
4fdc77f2a5 Make sytle consistent for popups and buttons. 2018-06-09 00:07:37 +01:00
Richard Alam
277dcc3b38 - remove logging of messages 
- do not instantiate main app shell twice. Otherwise, we'll get lots of exceptions.
 2018-06-08 15:57:47 -07:00
Anton Georgiev
deeec76c6f
Merge pull request #5511 from musickiper/adj-partList-chatModule-width 
Adjust default width in the style sheet of participants list and chat module
 2018-06-08 15:54:53 -04:00