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

18742 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chad Pilkey
b77be1a9f4 fix user avatar image sizing 2017-10-13 11:37:41 -07:00
Richard Alam
9984d168d2 Merge pull request #4523 from riadvice/fix-file-download 
[Flash 2.1] - Fix displaying file download button.
 2017-10-13 13:28:41 -04:00
Anton Georgiev
f1de51595d Merge pull request #4515 from OZhurbenko/fix-warnings-assign-presenter 
[HTML5] - Fix for the React console warnings
 2017-10-13 14:06:31 -03:00
Ghazi Triki
1cfe0697c7 Fix displaying file download button. 2017-10-13 11:48:40 -03:00
Ghazi Triki
cbe9ca666a Add new skins for the NumericStepper component to make the UI consistent. 2017-10-13 11:40:24 -03:00
Richard Alam
62d7461ae5 Merge branch 'riadvice-2x-browser-detection' into v2.0.x-release 2017-10-13 07:03:30 -07:00
Richard Alam
f197aaff62 Merge branch '2x-browser-detection' of https://github.com/riadvice/bigbluebutton into riadvice-2x-browser-detection 2017-10-13 06:52:32 -07:00
Oleksandr Zhurbenko
b3572cec3a Changed the way the object is assigned 2017-10-12 17:20:27 -07:00
Anton Georgiev
8e6e450195 Merge pull request #4514 from OZhurbenko/merge-2.0-1.1-api 
[HTML5] - Follow up on 2.0 -> 1.1 api merge
 2017-10-12 21:17:47 -03:00
Anton Georgiev
8e1e6225bb Merge pull request #4517 from jfsiebel/breakoutrooms-modal-hide 
[HTML 5] Closes breakout room modal when the breakout room are closed
 2017-10-12 21:17:18 -03:00
Ghazi Triki
7449f1555e Fix toolbar top paddingTop style. 2017-10-12 20:14:14 -03:00
Tiago Daniel Jacobs
48f4750d2b Merge pull request #4520 from ritzalam/change-listen-only-for-html5 
Change listen only for html5
 2017-10-12 19:46:04 -03:00
Joao Siebel
8b8456a1ac Closes breakout room modal when the breakout room are closed 2017-10-12 19:39:03 -03:00
Richard Alam
11c7287d26 - don't force changing listen only status on mute and talking events 2017-10-12 15:36:19 -07:00
Richard Alam
73493f1345 - change how we handle listen only for html5 user 2017-10-12 15:33:22 -07:00
Richard Alam
2c103ce6fc Merge pull request #4518 from ritzalam/change-listen-only-for-html5 
- do not set listenOnly status when receiving user joined voice event..
 2017-10-12 17:43:42 -04:00
Richard Alam
680a538596 - do not set listenOnly status when receiving user joined voice event from FS as 
HTML5 client connects with no mic
 2017-10-12 14:41:12 -07:00
Ghazi Triki
05b400267f Directly use Flash Audio if under HTTP using chrome >= 60 or opera >= 47 2017-10-12 18:40:11 -03:00
Ghazi Triki
770947c065 Show a message when accessing webcam from HTTP using chrome >= 60 or opera >= 47 2017-10-12 18:30:45 -03:00
Ghazi Triki
58f60efe40 Improve opera browser detection. 2017-10-12 18:21:20 -03:00
Ghazi Triki
51abc59bd8 Refactor BrowserCheck class to store browser data and call the "determineBrowser" external interface method only once. 2017-10-12 17:18:48 -03:00
Richard Alam
4ad3b30fff Merge pull request #4511 from kepstin/bbb-20-rec-fixes 
Handle out of order inserts at the start of a caption stream.
 2017-10-12 15:20:01 -04:00
Richard Alam
6cebf50725 Merge branch 'capilkey-fix-whiteboard-click-through' into v2.0.x-release 2017-10-12 12:18:57 -07:00
Richard Alam
a374b61245 Merge branch 'fix-whiteboard-click-through' of https://github.com/capilkey/bigbluebutton into capilkey-fix-whiteboard-click-through 2017-10-12 12:11:00 -07:00
Oleksandr Zhurbenko
430ddc0d3b Removing unnecessary 2x from the collections, publishers, subscriptions and logs 2017-10-12 12:07:02 -07:00
Richard Alam
efc8055041 Merge pull request #4512 from ritzalam/synch-with-2.0.x-release 
Synch with 2.0.x release
 2017-10-12 14:57:48 -04:00
Richard Alam
86a6881d93 Merge branch 'client-pdf-export' of https://github.com/riadvice/bigbluebutton into synch-with-2.0.x-release 2017-10-12 11:55:52 -07:00
Richard Alam
53f1225c32 Merge branch 'v2.0.x-release' into synch-with-2.0.x-release 2017-10-12 11:32:54 -07:00
Ghazi Triki
99e55b000a Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into client-pdf-export 
# Conflicts:
#	bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla
#	bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf
 2017-10-12 15:21:22 -03:00
Calvin Walton
b2f8c80202 Handle out of order inserts at the start of a caption stream. 
If you're inserting at position 0 (and there was no previous deleted text
from that position), you can't use the timestamp from the previous character
position, since there's no previous character. Use the timestamp of the
following character instead.
 2017-10-12 14:16:34 -04:00
Richard Alam
532195dc21 Merge branch 'riadvice-2x-ui-improve' into v2.0.x-release 2017-10-12 10:07:30 -07:00
Richard Alam
047b5a5a11 Merge branch '2x-ui-improve' of https://github.com/riadvice/bigbluebutton into riadvice-2x-ui-improve 2017-10-12 10:02:50 -07:00
Richard Alam
1383a52e7f Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into v2.0.x-release 2017-10-12 09:57:25 -07:00
Richard Alam
626faeb110 Merge branch 'riadvice-native-locale-name' into v2.0.x-release 2017-10-12 09:56:11 -07:00
Anton Georgiev
4acecd358c Merge pull request #4505 from OZhurbenko/merge-2.0-1.1-api 
[HTML5] - Merged 2.0 and 1.1 api folders
 2017-10-12 13:45:46 -03:00
Richard Alam
0d7fd28513 Merge branch 'native-locale-name' of https://github.com/riadvice/bigbluebutton into riadvice-native-locale-name 2017-10-12 09:44:44 -07:00
Ghazi Triki
2f5c6091bb Less spacing between user renderers buttons to avoid showing the horizontal scroll bar while displaying on small screens. 2017-10-12 13:36:18 -03:00
Anton Georgiev
8edf6d52b7 Merge pull request #4507 from KDSBrowne/z03-fix-missing-enjson-strings 
[HTML5] - Add missing en.json strings
 2017-10-12 13:36:03 -03:00
Ghazi Triki
2c7d910d83 Display native locale name in LanguageSelector menu. 2017-10-12 13:27:55 -03:00
KDSBrowne
31b9a17e2c add new line 2017-10-12 09:17:20 -07:00
KDSBrowne
5d6a273a57 add missing en.json strings 2017-10-12 09:14:05 -07:00
Richard Alam
1e63904b37 Merge pull request #4500 from ritzalam/upgrade-master-to-latest-red5 
Upgrade master to latest red5
 2017-10-12 09:44:58 -04:00
Richard Alam
a8df8f3cb3 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into v2.0.x-release 2017-10-12 06:37:12 -07:00
Richard Alam
bc9f66d63b Merge branch 'riadvice-2x-client-theme' into v2.0.x-release 2017-10-12 06:36:21 -07:00
Richard Alam
265dbb037b Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-10-12 06:23:02 -07:00
Anton Georgiev
af9f1e4dd3 Merge pull request #4506 from KDSBrowne/z01-update-locale-files 
[HTML5] - add translation files from Transifex
 2017-10-12 10:17:28 -03:00
Anton Georgiev
0824bc1471 Merge pull request #4503 from oswaldoacauan/user-list-scroll-bg 
[HTML5] Fix user-list scroll shadow and message list max height
 2017-10-12 09:53:42 -03:00
Oleksandr Zhurbenko
1ec0c11fe4 Permissions fix 2017-10-11 19:01:07 -07:00
Oleksandr Zhurbenko
015ca3d719 Changed imports and removed 'initializeCursor.js' since it's not needed 2017-10-11 19:00:28 -07:00
Oleksandr Zhurbenko
70b3a14aec Moved meetingDestruction to where it is supposed to be 2017-10-11 18:15:13 -07:00