Commit Graph

18649 Commits

Author SHA1 Message Date
Anton Georgiev
f7ba155f97 Merge pull request #4524 from oswaldoacauan/patch-3
[HTML5] Fix logClient method name
2017-10-24 17:04:38 -02:00
Anton Georgiev
967be17440 Merge pull request #4521 from Tainan404/fix-presenter-modal-bug
[HTML5] Fix presentation upload modal  bug
2017-10-24 17:02:47 -02:00
Anton Georgiev
9f2b364710 Merge pull request #4553 from OZhurbenko/fix-settings-cancel
[HTML5] - Fix for Settings not being closed
2017-10-24 16:58:40 -02:00
Oswaldo Acauan
e76459be65 Merge remote-tracking branch 'upstream/v2.0.x-release' into patch-3 2017-10-24 11:11:18 -02:00
Anton Georgiev
25da1672cd Merge pull request #4513 from oswaldoacauan/toast-notifications
[HTML5] Toast notifications
2017-10-24 11:05:48 -02:00
Oswaldo Acauan
fda223e81d Merge remote-tracking branch 'upstream/v2.0.x-release' into patch-3 2017-10-24 11:01:58 -02:00
Oswaldo Acauan
3bd0d349f8 Add handler to log all uncaught client exceptions 2017-10-24 10:59:23 -02:00
Oswaldo Acauan
45d604c63d Refactor logger from client to server 2017-10-24 10:58:46 -02:00
Tainan Felipe
8e2f29e667 changed assign of the function 2017-10-24 08:52:44 -02:00
Oswaldo Acauan
28c19ec82d Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-notifications 2017-10-24 07:57:52 -02:00
Oleksandr Zhurbenko
a2c635d094 Fixed a bug with Settings not being closed when click Cancel 2017-10-23 16:19:02 -07:00
Oleksandr Zhurbenko
6049223e3a Fixed a typo 2017-10-23 16:16:54 -07:00
Anton Georgiev
eb9dd49b75 Merge pull request #4551 from Tainan404/fix-errors-linter
[HTML5] Fix issue introduced on #4488
2017-10-23 15:53:32 -02:00
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
Tainan Felipe
02c617da68 solve error in nav-bar component 2017-10-23 14:26:56 -02:00
Tainan Felipe
da608da325 fix merge issue 2017-10-23 14:15:55 -02:00
Tainan Felipe
1469791bc7 solve merge issues 2017-10-23 13:50:31 -02:00
Tainan Felipe
5ac96e6979 solve merge issues 2017-10-23 13:47:14 -02:00
Oswaldo Acauan
1dcfb9e3fa Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-notifications 2017-10-23 13:31:33 -02: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
Oswaldo Acauan
f17faf6d75 Fix closeToast warning 2017-10-23 10:25:05 -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
Oswaldo Acauan
8af4d227db Fix notification service exports 2017-10-20 17:27:00 -02:00
Oswaldo Acauan
11908b8ecf Fix file extension and turn eslint rule off 2017-10-20 17:09:01 -02:00
Oswaldo Acauan
9f910fa26e Move hoc and service to separate dir's 2017-10-20 17:01:07 -02:00
Oswaldo Acauan
a26e20d76b Fix wrong prop name record => recording 2017-10-20 17:00:34 -02: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