BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,576 Commits 13 Branches 260 Tags 1.1 GiB
a3adc5e070
Commit Graph

17576 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
a3adc5e070 Merge pull request #4230 from ritzalam/fix-end-time-format 
- fix end time format of get-meeting-info api response
 2017-08-11 11:14:56 -04:00
Richard Alam
a81f2474e0 - fix end time format of get-meeting-info api response 2017-08-10 14:26:10 -07:00
Richard Alam
89d70ad188 Merge branch 'ritzalam-end-breakout-rooms' into bbb-2x-mconf 2017-08-10 14:11:20 -07:00
Richard Alam
53b64fcca0 Merge branch 'end-breakout-rooms' of https://github.com/ritzalam/bigbluebutton into ritzalam-end-breakout-rooms 2017-08-10 13:58:02 -07:00
Richard Alam
e1cb751e4a Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-08-10 13:55:17 -07:00
Richard Alam
e2aedbdb31 Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-08-10 13:51:03 -07:00
Richard Alam
774caa5c9c Merge branch 'antobinary-fix-webcam-state' into bbb-2x-mconf 2017-08-10 13:50:00 -07:00
Richard Alam
7f63490e63 - end breakout rooms when parent meeting ends 
- send breakout ended event
 - do not send negative time remaining updates
 2017-08-10 13:29:33 -07:00
Ghazi Triki
f1c73c1aad Swap sad and neutral icons to fix them. 2017-08-10 21:21:06 +01:00
Ghazi Triki
af123e25cd Added disabled icons for top toolbar buttons. 2017-08-10 20:58:46 +01:00
Anton Georgiev
1e492dba73 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into fix-webcam-state 2017-08-10 15:31:29 -04:00
Anton Georgiev
1dc5de1665 cleanup unused object 2017-08-10 15:30:29 -04:00
Anton Georgiev
4ba3375fb4 update whiteboard (non)presenter view after reconnect 2017-08-10 15:29:27 -04:00
Ghazi Triki
18c618e1fc Change the order of main toolbar buttons. 2017-08-10 20:12:22 +01:00
Richard Alam
39c6a07b1f Merge pull request #4220 from ritzalam/send-msgs-using-different-channels 
- send messages into separate channels so other components can  …
 2017-08-10 13:39:39 -04:00
Ghazi Triki
7f3a5dfdd0 Update notification status for chat tab. 2017-08-10 18:38:08 +01:00
Richard Alam
d50041f03c - send messages into separate channels so other components can pick and choose which 
channels to listen to.
 2017-08-10 10:14:50 -07:00
Ghazi Triki
e160084ab5 Updated settings windows style and highlighted tab style. 2017-08-10 16:12:20 +01:00
Anton Georgiev
0546afce1f only allow presenter to change slide 2017-08-10 10:59:03 -04:00
Anton Georgiev
0b8a8c856b replace old user copy with the updated user to avoid false state 2017-08-10 10:52:56 -04: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
97b3c2fec9 Merge branch 'fix-webcam-state' of github.com:antobinary/bigbluebutton into fix-webcam-state 2017-08-08 15:57:43 -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