Richard Alam
24def2ce7e
Merge branch 'riadvice-config-options-clean' into v2.0.x-release
2017-10-20 08:05:24 -07:00
Richard Alam
bf5d5de34e
Merge branch 'config-options-clean' of https://github.com/riadvice/bigbluebutton into riadvice-config-options-clean
2017-10-20 07:58:22 -07:00
Richard Alam
bd68aa3128
Merge pull request #4543 from ritzalam/remove-auto-join-voice-on-reconnect
...
Remove auto-join voice handler on auto-reconnect
2017-10-20 10:56:49 -04:00
Richard Alam
333dba585b
- remove for now as sometimes when reconnect occurs while there is only one user in the voice conference and
...
the meeting is being records, the audio conference fails to record.
2017-10-20 07:38:50 -07:00
Ghazi Triki
bd1e8a0f08
Remove trailing spaces in config.xml.template
2017-10-20 15:37:38 +01:00
Richard Alam
97f14ddfac
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into v2.0.x-release
2017-10-20 07:36:39 -07:00
Richard Alam
fb58a5f0ca
Merge branch 'riadvice-breakout-audio-rejoin' into v2.0.x-release
2017-10-20 07:36:14 -07:00
Anton Georgiev
e0db8b1d3e
Merge pull request #4533 from jfsiebel/fix-update-voice-user-function-name
...
Fix function name in updateVoiceUser
2017-10-20 12:30:25 -02:00
Ghazi Triki
f3ba3e5ac9
Clean ununsed options properties and classes.
2017-10-20 11:17:19 +01:00
Ghazi Triki
b447d18b04
Invalidate 'breakoutEjectFromAudio' state if the join audio button is pressed.
2017-10-19 15:59:01 +01:00
Ghazi Triki
ec48b1ec2d
Display join audio window if back from breakout room.
2017-10-19 15:51:58 +01:00
Richard Alam
1abba9391d
Merge branch 'riadvice-2x-client-theme' into v2.0.x-release
2017-10-19 07:17:30 -07:00
Richard Alam
b718d92767
Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme
2017-10-19 07:12:46 -07:00
Ghazi Triki
e1b5d6b9f1
Improve screen-sharing view layout and video scaling.
2017-10-18 18:31:04 +01:00
Joao Siebel
da9e2ef3a4
Fix function name in updateVoiceUser
2017-10-18 10:30:33 -02:00
Richard Alam
fa877e8f73
Merge branch 'capilkey-fix-user-avatar-size' into v2.0.x-release
2017-10-16 10:36:35 -07:00
Richard Alam
9e193bf631
Merge branch 'fix-user-avatar-size' of https://github.com/capilkey/bigbluebutton into capilkey-fix-user-avatar-size
2017-10-16 10:30:39 -07:00
Richard Alam
bffaabfffd
Merge branch 'riadvice-2x-client-theme' into v2.0.x-release
2017-10-13 14:37:26 -07:00
Richard Alam
d4997454e8
Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme
2017-10-13 14:21:40 -07:00
Ghazi Triki
f72d165fa9
Make most of the popup windows closable using keayboard ESCAPE button.
2017-10-13 18:14:50 -03:00
Ghazi Triki
0d634b4c0d
Redesign CustomLayoutNameWindow window.
2017-10-13 18:13:33 -03:00
Ghazi Triki
c693215cab
Remove scrollbar from AddChatTabBox component.
2017-10-13 18:12:43 -03:00
Chad Pilkey
b77be1a9f4
fix user avatar image sizing
2017-10-13 11:37:41 -07: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
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
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
