Commit Graph

18667 Commits

Author SHA1 Message Date
Gabriel Carvalho de Campes
144705ce9b change func call to a variable 2017-10-27 11:44:42 -02:00
Gabriel Carvalho de Campes
9bb0248957 fix logout issue on meeting end 2017-10-26 16:45:03 -02:00
Chad Pilkey
590e6ecec0 Merge pull request #4573 from capilkey/fix-poll-btn-exception
Fix exception when the PollingModule is commented out
2017-10-26 12:52:44 -04:00
Chad Pilkey
41c1adb717 fix exception when the PollModule is commented out 2017-10-26 12:46:11 -04:00
Richard Alam
436b4bcc1b Merge pull request #4570 from ritzalam/add-user-on-reconnect
- add user into user's list when auto-reconnected to bbb-apps
2017-10-25 17:59:47 -04:00
Richard Alam
1fc7362b2b - add user into user's list when auto-reconnected to bbb-apps 2017-10-25 14:58:09 -07:00
Richard Alam
8a30f417bf Merge branch 'riadvice-2.0-gui-fix' into v2.0.x-release 2017-10-25 12:20:37 -07:00
Richard Alam
1d79d39bba Merge branch '2.0-gui-fix' of https://github.com/riadvice/bigbluebutton into riadvice-2.0-gui-fix 2017-10-25 12:11:23 -07:00
Ghazi Triki
d1a76be4b0 Improve HTTPS needed for webcam. 2017-10-25 19:41:20 +01:00
Ghazi Triki
7fb1ef867d Change alert labels when locale is changed. 2017-10-25 19:10:30 +01:00
Ghazi Triki
f091d0d318 Code cleanup. 2017-10-25 18:17:41 +01:00
Ghazi Triki
900955e6b2 Make alert buttons larger. 2017-10-25 17:53:36 +01:00
Ghazi Triki
3f51c54744 Improve screen sharing switch display button style. 2017-10-25 08:06:06 +01:00
Fred Dixon
12e7a7f0d5 Merge pull request #4562 from ritzalam/update-locales-oct-24-2017
Update locales oct 24 2017
2017-10-24 17:15:57 -04:00
Richard Alam
cbdd70fff6 - update locales 2017-10-24 13:21:28 -07:00
Richard Alam
af3273b427 Merge pull request #4561 from ritzalam/add-voice-users
Fix a couple of issue
2017-10-24 16:15:30 -04:00
Richard Alam
e02189b922 - fix https://github.com/bigbluebutton/bigbluebutton/issues/4541 2017-10-24 13:08:47 -07:00
Richard Alam
3e15405966 - show voice only users in get meeting api response 2017-10-24 12:59:09 -07:00
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