Commit Graph

18616 Commits

Author SHA1 Message Date
Fred Dixon
333f239b0b Merge pull request #4552 from riadvice/screen-share-improve
[Flash 2.0] - Center ScreenshareViewWindow and make windows behind visible
2017-10-23 13:49:11 -04:00
Ghazi Triki
ca18daa681 Update switch display button style. 2017-10-23 18:20:10 +01:00
Ghazi Triki
d1cadd1237 Center ScreenshareViewWindow and make windows behind visible. 2017-10-23 18:14:16 +01:00
Anton Georgiev
4566d82a2a Merge pull request #4488 from Tainan404/fix-errors-linter
[HTML5] Fix errors linter
2017-10-23 12:27:38 -02:00
Tainan Felipe
896883ecd9 remove comment in recording-indicator component 2017-10-23 12:01:00 -02:00
Fred Dixon
ca285e13f6 Merge pull request #4550 from riadvice/screen-share-improve
[Flash 2.0] - Improve desktop sharing windows placement and resize window behaviour
2017-10-22 07:41:26 -04:00
Ghazi Triki
08eced8bbe Improve desktop sharing windows placement and resize window behaviour. 2017-10-22 11:56:27 +01:00
Oleksandr Zhurbenko
380c67f18f Merge pull request #4538 from MaximKhlobystov/khmer-locale-fix
[HTML5 Client] Khmer locale fix
2017-10-21 21:31:14 -04:00
Maxim Khlobystov
6dd484db4f Indentations cleanup. 2017-10-21 21:30:24 -04:00
Maxim Khlobystov
03eced3236 Updated locales. 2017-10-20 15:17:52 +00:00
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
Maxim Khlobystov
a11e695756 Made sure the fix for escaping backslashes is applied when you run the Transifex for all locales at once. 2017-10-19 20:58:47 +00:00
Maxim Khlobystov
0b84b9c443 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into khmer-locale-fix 2017-10-19 20:34:02 +00:00
Maxim Khlobystov
f455ec97bd Updated the Khmer labels (doesn't break anymore). 2017-10-19 20:29:30 +00:00
Maxim Khlobystov
c44bd1c7fd Fixed the Transifex script to make sure it preserve escaping backslashes in the JSON file supplied by Transifex. 2017-10-19 20:24:36 +00: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
Tainan Felipe
873d227819 Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter 2017-10-13 10:35:38 -03: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