Commit Graph

17557 Commits

Author SHA1 Message Date
Ghazi Triki
7f3a5dfdd0 Update notification status for chat tab. 2017-08-10 18:38:08 +01:00
Ghazi Triki
e160084ab5 Updated settings windows style and highlighted tab style. 2017-08-10 16:12:20 +01:00
Ghazi Triki
3df8e6fb3c Add missing enableGuestUI option to UsersModule configuration. 2017-08-10 15:46:38 +01:00
Richard Alam
51df1122d4 Merge branch 'pedrobmarin-fix-promote-demote-users' into bbb-2x-mconf 2017-08-09 14:11:22 -07:00
Richard Alam
6f9a9c09e3 Merge branch 'fix-promote-demote-users' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-fix-promote-demote-users 2017-08-09 14:04:00 -07:00
Richard Alam
20381b5fb8 Merge branch 'pedrobmarin-fix-webcam-fullscreen' into bbb-2x-mconf 2017-08-09 14:02:28 -07:00
Richard Alam
f4748c0912 Merge branch 'fix-webcam-fullscreen' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-fix-webcam-fullscreen 2017-08-09 13:59:16 -07:00
Richard Alam
902d57df22 Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-08-09 13:56:56 -07:00
Richard Alam
3ac8aa3fd2 - change logs to trace as logging isn't initialized yet when these are called.
- send locale version even if when locale fails to load because it isn't available. The client needs to
   match locale versions from config.xml and the locale itself to make sure the locale strings are correct.
   If the client doesn't receive both version, the client won't continue.
2017-08-09 13:54:20 -07:00
Richard Alam
6af15555f7 - minimize logging 2017-08-09 13:53:26 -07:00
Pedro Beschorner Marin
185f6a85e9 Missing code for the promote/demote users feature 2017-08-09 20:13:52 +00:00
Pedro Beschorner Marin
bf5b73c7a5 Fixing Firefox's Flash NPE 2017-08-09 18:22:15 +00:00
Ghazi Triki
5dc6d390e1 Properly fallback to the master locale when a selected locale is not available. 2017-08-09 17:28:12 +01:00
Pedro Beschorner Marin
422faf7014 Fixed webcam fullscreen display position 2017-08-09 16:11:44 +00:00
Richard Alam
2903ece51d Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into bbb-2x-mconf 2017-08-09 07:21:50 -07:00
Richard Alam
9a88fbbbe3 Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-08-09 07:21:17 -07:00
Anton Georgiev
5944cb183a Merge pull request #4209 from Klauswk/html5-toggle-mute
[HTML5 2.0] Add Mute/Unmute methods
2017-08-09 10:15:17 -04:00
Ghazi Triki
14e10ce862 Updated text formatting icon for shared notes. 2017-08-09 10:50:05 +01:00
Ghazi Triki
733f122953 Use default selection and rollover colours for lists. 2017-08-09 10:36:45 +01:00
Ghazi Triki
46dc367be3 Fix MediaItemRenderer icons. 2017-08-09 09:19:27 +01:00
Richard Alam
cbb157b16f Merge branch 'antobinary-fix-webcam-state' into bbb-2x-mconf 2017-08-08 14:42:41 -07:00
Richard Alam
131c67def3 Merge branch 'fix-webcam-state' of https://github.com/antobinary/bigbluebutton into antobinary-fix-webcam-state 2017-08-08 14:41:51 -07:00
Richard Alam
f00e8010c6 Merge pull request #4214 from ritzalam/implement-ping-pong-with-bbb-web
- set also the status response
2017-08-08 17:08:06 -04:00
Richard Alam
3fe435668d - set also the status response 2017-08-08 14:06:53 -07:00
Richard Alam
0aec7c88a5 Merge pull request #4213 from ritzalam/implement-ping-pong-with-bbb-web
- return the following response when api service is unavailable.
2017-08-08 16:53:21 -04:00
Richard Alam
fae9dfdf14 - return the following response when api service is unavailable.
<response>
  <returncode>503</returncode>
  <reason>API Service Unavailable</reason>
</response>
2017-08-08 13:50:08 -07:00
Richard Alam
cd2ca71ff9 Merge pull request #4211 from ritzalam/implement-ping-pong-with-bbb-web
- implement check to see if akka-apps is alive from bbb-web so we ca…
2017-08-08 16:12:56 -04:00
Anton Georgiev
6b4c9ea8a4 drop camera for leaving user 2017-08-08 15:22:21 -04:00
Richard Alam
1a698058e1 - implement check to see if akka-apps is alive from bbb-web so we can return an
error to API requests
2017-08-08 12:16:00 -07:00
Klauswk
0ce41afabb Merge branch 'bbb-2x-mconf' into html5-toggle-mute 2017-08-08 13:59:00 -03:00
Richard Alam
9c50aa4280 Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-08-08 08:38:41 -07:00
Richard Alam
5648f7ef8a Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-08-08 08:34:21 -07:00
Anton Georgiev
34a3afc26b Merge pull request #4157 from oswaldoacauan/userlist-2x-design
[HTML5 2.0] User-list Redesign
2017-08-08 10:56:56 -04:00
Oswaldo Acauan
716ee5902f Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design 2017-08-08 11:52:26 -03:00
Ghazi Triki
d8278c24da Revert back dark style when video chat layout is selected. 2017-08-08 13:30:18 +01:00
Ghazi Triki
3462c716be Make SlideView background white. 2017-08-08 11:22:29 +01:00
Ghazi Triki
5b8ae10d3c Updated chat options style, default radio button and checkbox styles. 2017-08-08 11:09:46 +01:00
Ghazi Triki
1f001ee0cb Update BBBSettings title position and style. 2017-08-07 21:15:16 +01:00
Ghazi Triki
b5bffb0816 Remove unused code in TabSkin class. 2017-08-07 21:14:47 +01:00
Ghazi Triki
35cc113996 Added new sking for the Tab component and updated chat list style. 2017-08-07 18:21:43 +01:00
Ghazi Triki
9a1553f95e Show presentation download button only when there is at least one downloadable presentation. 2017-08-07 14:07:47 +01:00
Fred Dixon
b2aa0fbc91 Merge pull request #4208 from OZhurbenko/ff-55-56-flash-hanging-2.0
Fixes hanging Flash on tab switch in Firefox 55-56
2017-08-06 07:37:18 -04:00
Oleksandr Zhurbenko
db1b8c3ecb Added a check for Windows 2017-08-04 16:01:43 -07:00
Klaus
526518e740 Remove duplicate lines 2017-08-04 17:20:24 -03:00
Klaus
0807960da4 Fix missing method for mute user 2017-08-04 17:05:18 -03:00
Oleksandr Zhurbenko
02a1855650 Added a check to detect a 32 bit version of Firefox only 2017-08-04 12:46:34 -07:00
Oleksandr Zhurbenko
dd671737f7 Fixes hanging Flash on tab switch in Firefox 55-56 2017-08-04 12:18:38 -07:00
Oswaldo Acauan
e07c8b41af Add autofocus when switching/entering chat 2017-08-04 15:32:21 -03:00
Oswaldo Acauan
78e88c8189 Fix unread counter 2017-08-04 15:20:54 -03:00
Oswaldo Acauan
720dddec24 Fix chat styles 2017-08-04 15:17:15 -03:00