Commit Graph

165 Commits

Author SHA1 Message Date
Oswaldo Acauan
df0a53d67c Merge branch 'fix-4690' of https://github.com/oswaldoacauan/bigbluebutton into fix-4690 2018-04-03 10:20:19 -03:00
Oswaldo Acauan
21550c1d3c Fix wrong connecting state when joining mic or echo test 2018-04-03 10:19:50 -03:00
Oswaldo Acauan
1465c83fb6
Merge branch 'v2.0.x-release' into fix-4690 2018-04-02 12:50:45 -03:00
Oswaldo Acauan
0e5fc698b0 Fix reconnecting users being redirected to /logout 2018-03-16 16:22:27 -03:00
Oswaldo Acauan
5141b71d4f Prevent infinity loop when joining listen only 2018-03-15 16:30:50 -03:00
Oswaldo Acauan
bcaa8b2f6d Remove getUserMedia in the first join as listen only 2018-03-15 15:57:25 -03:00
Anton Georgiev
42809a61f0
Merge pull request #5099 from jfsiebel/screenshare-data-saving-setting
Implement screen share data saving setting
2018-03-05 11:54:48 -05:00
Oswaldo Acauan
2f741df97b Impl user-session based connections on server. Fix #5150
Implement a connectionId for each user, each time a user try to validate we change their connectionId
and end all other connections of that user.
2018-02-20 11:26:36 -03:00
João Francisco Siebel
6bb031076b Resolve merge problems 2018-02-19 14:00:43 -03:00
Tainan Felipe Pauli de Almeida
38e3ce3013 Merge remote-tracking branch 'upstream/v2.0.x-release' into lock-settings 2018-02-06 13:21:22 -02:00
Joao Siebel
eddc480851 Implement screenshare data saving setting. Fix #5029 2018-02-06 11:33:48 -02:00
Anton Georgiev
f789842ccb
Merge pull request #5009 from KDSBrowne/z.0.6-prevent-ghost-user
Prevent kicked user's ability to rejoin meeting via back btn
2018-01-30 15:10:46 -05:00
KDSBrowne
6b1e39008c move if condition for User.ejected 2018-01-29 20:23:56 -08:00
KDSBrowne
aa4a7ef48c clean up code 2018-01-29 11:07:02 -08:00
KDSBrowne
90bfea5d77 check if user was ejected 2018-01-29 10:17:52 -08:00
Tainan Felipe Pauli de Almeida
fc5ae9b07e apply lock settings on webcam sharing 2018-01-29 09:52:07 -02:00
KDSBrowne
d0f6e4f3a2 add console logs to determin flow 2018-01-26 14:17:34 -08:00
Anton Georgiev
748ee1279a
Merge pull request #4941 from MaximKhlobystov/mute-button-icon-update-fix
[HTML5 Client] Fix for Mute/Unmute button's icon update.
2018-01-16 14:06:30 -02:00
Maxim Khlobystov
893067139b Declared the muteHandle variable. 2018-01-16 10:56:31 -05:00
Maxim Khlobystov
d9955ae286 Small cleanup. 2018-01-15 16:13:18 -05:00
Maxim Khlobystov
1394984be7 Made the mute/unmute observer work. 2018-01-15 16:01:57 -05:00
Tainan Felipe
8ae1fd1820 Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-moderator-ends 2018-01-11 09:19:56 -02:00
Maxim Khlobystov
aeb1aeb14b Made sure the mute/unmute button is updated when Flash client mutes/unmutes HTML5 client. 2018-01-10 15:51:10 -05:00
Maxim Khlobystov
12e474fa01 Doing the mute/unmute flag change inside the Audio Manager instead of using Mongo observer. 2018-01-10 15:41:21 -05:00
Oswaldo Acauan
eb4c89aefc Fix bug when users re-validate after refresh 2017-12-19 10:19:47 -02:00
Oswaldo Acauan
ced25948dd Fix 401 on page refresh 2017-12-18 13:52:04 -02:00
Tainan Felipe
bbbb64b4fd fix error in logoutURL 2017-12-13 16:59:24 -02:00
Oswaldo Acauan
b7fa508d9d Simplify auth code and remove clearCredentials on errors. Fix #4812 2017-12-13 16:20:47 -02:00
Anton Georgiev
a30026a5ed
Merge pull request #4804 from OZhurbenko/fix-edge-default-locale
Fixed a problem with the default locale selection in Edge
2017-12-12 16:16:38 -02:00
Oleksandr Zhurbenko
15f8099b84 Fixes a default locale selection for Edge, Windows 10 2017-12-12 09:05:43 -08:00
Gabriel Carvalho de Campes
7d333e7245 removes unwanted change in auth 2017-11-17 17:17:16 -02:00
Gabriel Carvalho de Campes
74bb2bb5e8 fix permission overlay positioning, localizes messages 2017-11-17 17:01:52 -02:00
Gabriel Carvalho de Campes
effb21fc1f Changes and enhancements on audio, wIP 2017-11-17 09:52:48 -02:00
Gabriel Carvalho de Campes
36c9d85749 Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-11-16 09:13:47 -02:00
Gabriel Carvalho de Campes
92b1081186 add permission overlay on audio 2017-11-08 16:41:15 -02:00
Gabriel Carvalho de Campes
d144aa0d00
Fixes settings service
settings service was missing a `||`
2017-11-07 14:21:43 -02:00
Maxim Khlobystov
bc1a4c473c
Merge pull request #4581 from Gcampes/locale-browser-default
Set initial locale to be the browser one
2017-11-06 11:16:36 -05:00
Gabriel Carvalho de Campes
24f66860f8 fix for browsers that do not support navigator.languages 2017-11-06 10:21:21 -02:00
Gabriel Carvalho de Campes
fa52daf34a change initial locale setting 2017-11-06 10:06:05 -02:00
Anton Georgiev
63eb812f85
Merge pull request #4578 from OZhurbenko/meteor-react-16-update
React 16 and packages update
2017-11-02 10:41:45 -02:00
Gabriel Carvalho de Campes
e55ee0d28e fix listen only dead end on permissions denied 2017-11-02 10:10:01 -02:00
Gabriel Carvalho de Campes
fde5d56d87 change ask permissions timing, small code fixes 2017-10-31 08:53:06 -02:00
Gabriel Carvalho de Campes
00bf09c4f9 Fix issue with locales 2017-10-27 09:36:27 -02:00
Gabriel Carvalho de Campes
cf73251feb Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-26 16:26:19 -02:00
Gabriel Carvalho de Campes
81f35bac4f Fix concerns from review 2017-10-26 15:14:56 -02:00
Oleksandr Zhurbenko
df3325e42f Fixed a bug introduced in #4524 2017-10-25 16:12:17 -07:00
Oleksandr Zhurbenko
6dabe055d8 bug fixes; CSS animation package update; updated package-lock; fixed permissions; 2017-10-25 16:11:06 -07:00
gcampes
d32330b208 Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-24 11:19:58 -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
Oswaldo Acauan
45d604c63d Refactor logger from client to server 2017-10-24 10:58:46 -02:00