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

13366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
e03373b87e Merge pull request #3346 from ritzalam/fix-custom-poll 
- change jws failed to start timeout from 60s to 90s. Sometimes it t…
 2016-09-01 10:31:43 -04:00
Richard Alam
23f77682bd - change jws failed to start timeout from 60s to 90s. Sometimes it takes about 
30s to download the libs especially for those far from the server or those with
   slow connection.
 2016-09-01 14:29:52 +00:00
Oswaldo Acauan
249dd85f92 Move old settings modal to the new component 2016-09-01 13:56:41 +00:00
Richard Alam
bbdded9706 Merge pull request #3344 from ritzalam/fix-custom-poll 
- custom poll was sent to the wrong actor. Route it to the correct m…
 2016-08-31 18:15:01 -04:00
Richard Alam
17e465409d - custom poll was sent to the wrong actor. Route it to the correct meeting actor. 2016-08-31 22:13:47 +00:00
Oswaldo Acauan
7a33f9ee67 Remove unused modal logs 2016-08-31 19:53:40 +00:00
Oswaldo Acauan
9a9b74665f Add new modal component 2016-08-31 19:52:17 +00:00
Richard Alam
4cd9f0337f Merge pull request #3343 from ritzalam/cleanup-client-logging 
- propagate meeting metadata from parent to breakout room
 2016-08-31 15:36:34 -04:00
Richard Alam
310ec81345 - propagate meeting metadata from parent to breakout room 2016-08-31 19:34:07 +00:00
Anton Georgiev
2e82f33dd7 Merge pull request #3333 from antobinary/html5-audio 
html5client: removed a package depencency; adjustments for Meteor 1.4.1.1; removed an error log
 2016-08-31 13:10:25 -04:00
Richard Alam
d59fdd1d97 Merge pull request #3341 from capilkey/add-cc-locale-code 
Add property to closed caption transcript model for the locale code
 2016-08-31 13:09:28 -04:00
Richard Alam
4e48fbe268 Merge pull request #3342 from capilkey/add-fourth-ss-pic 
Add a fourth help image for mac screenshare
 2016-08-31 13:08:25 -04:00
Chad Pilkey
b8c1961f68 add a fourth help image for mac screenshare 2016-08-31 12:49:37 -04:00
Chad Pilkey
1b72f8b077 add property to closed caption transcript model for the locale code 2016-08-30 17:10:03 -04:00
Fred Dixon
42dc6803a5 Merge pull request #3340 from ffdixon/minor-update-screenshare-doc 
Added more explanation for Mac FireFox in screenshare-help.html
 2016-08-30 17:03:02 -04:00
Fred Dixon
0aac39cff3 Added more explanation for Mac FireFox in screenshare-help.html 2016-08-30 17:01:30 -04:00
Richard Alam
4c1205e582 Merge pull request #3339 from ritzalam/cleanup-client-logging 
- do not display the "Record" label.
 2016-08-30 16:53:40 -04:00
Richard Alam
a447974e5f - do not display the "Record" label. 2016-08-30 20:52:38 +00:00
Fred Dixon
f8b797fa4f Merge pull request #3338 from riadvice/deactivate-breakout-rooms-recording 
Hide breakout rooms checkbox
 2016-08-30 15:58:24 -04:00
Ghazi Triki
9f9aa989d2 Hide breakout rooms checkbox. 2016-08-30 20:53:28 +01:00
Fred Dixon
eba8fc1b44 Merge pull request #3337 from ffdixon/update-firefox-step-1 
Handle case for starting desktop sharing when using FireFox
 2016-08-30 15:48:29 -04:00
Fred Dixon
477ebb4986 Handle case for starting desktop sharing when using FireFox with default settings 2016-08-30 15:45:51 -04:00
Richard Alam
ae2540ddfb Merge pull request #3336 from ritzalam/cleanup-client-logging 
- allow logging of some events
 2016-08-30 15:11:15 -04:00
Richard Alam
d3a43f2354 - allow logging of some events 2016-08-30 18:53:28 +00:00
Richard Alam
ca3788ebb7 Merge pull request #3334 from riadvice/signout-api-redirection 
Updated LogoutURL handling by client
 2016-08-30 11:52:34 -04:00
Ghazi Triki
0520b66d89 Triggering logoutUrl navigation after calling signOut API in the client. 2016-08-29 23:44:06 +01:00
Anton Georgiev
349b216928 omit hiredis package; cleanup 2016-08-29 21:34:03 +00:00
Richard Alam
9a6ae52832 Merge pull request #3332 from ritzalam/start-pause-stop-screen-sharing-with-webrtc 
ffmpeg linux jars
 2016-08-29 16:46:08 -04:00
Richard Alam
1faca71ea2 - add ffmpeg linux jars 2016-08-29 20:43:44 +00:00
Richard Alam
bb005186b1 Merge pull request #3331 from jfederico/bbb1.1-fix-for-bugs 
Bbb1.1 fix for bugs
 2016-08-29 14:25:27 -04:00
jfederico
91beceb8f5 bbb-lti: Fixed error message showing up in javascript when romm was rendered 2016-08-29 13:55:20 -04:00
jfederico
3058564ae1 bbb-web: Fixed issue with registeredUser map not cleaned up 2016-08-29 13:53:50 -04:00
Fred Dixon
d038fa6065 Merge pull request #3330 from ffdixon/update-screenshare-help 
Updated help text for launching screen sharing
 2016-08-29 11:04:15 -04:00
Fred Dixon
738fc00ddf Updated help text for launching screen sharing 2016-08-29 11:02:30 -04:00
Richard Alam
cf4588203c Merge pull request #3328 from capilkey/screenshare-help-update 
Update two Mac screenshare help images
 2016-08-26 11:00:36 -04:00
Chad Pilkey
59e1ba93d7 update two Mac screenshare help images 2016-08-26 07:51:00 -07:00
Richard Alam
384ba12d63 Merge pull request #3322 from riadvice/breakout-rooms-close-invitation-window 
Auto-remove breakout room join alert at some conditions
 2016-08-26 10:07:38 -04:00
Richard Alam
acc55b9af1 Merge pull request #3326 from ritzalam/start-pause-stop-screen-sharing-with-webrtc 
- trigger jws failed to start timer when clicking the start button
 2016-08-25 17:56:56 -04:00
Richard Alam
22148cc2b0 - trigger jws failed to start timer when clicking the start button 2016-08-25 21:52:31 +00:00
Richard Alam
965d6fefff Merge pull request #3325 from capilkey/screenshare-error-notifications 
Screenshare error notifications
 2016-08-25 17:06:13 -04:00
Chad Pilkey
69f43b5726 Merge remote-tracking branch 'upstream/master' into screenshare-error-notifications 2016-08-25 14:03:47 -07:00
Chad Pilkey
5dbedbb06f add screenshare error messages to tell user when something goes wrong 2016-08-25 14:03:35 -07:00
Richard Alam
abaf4c6073 Merge pull request #3324 from capilkey/1.1-minor-fixes 
Minor fixes for 1.1
 2016-08-25 16:59:24 -04:00
Anton Georgiev
fb95afd16c Merge pull request #3273 from mmarangoni/settings-accessibility 
HTML5 Settings Accessibility
 2016-08-25 15:37:13 -04:00
Matthew Marangoni
cd842e0346 merged to upstream 2016-08-25 12:23:09 -07:00
Anton Georgiev
899a6de14b Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into html5-audio 2016-08-25 18:19:07 +00:00
Anton Georgiev
7f77f5835b apply 1.4.1.1 patch 2016-08-25 18:17:25 +00:00
Matthew Marangoni
43f7369806 Merge remote-tracking branch 'upstream/master' into settings-accessibility 2016-08-25 11:12:40 -07:00
Gabriel Carvalho de Campes
2b81f071cd Merge branch 'userlist-compact-mode' into compact-userlist 
* userlist-compact-mode:
  finishes initial ui for the compact userlist
  adds some compact states in the userlist
 2016-08-25 17:57:30 +00:00
Gabriel Carvalho de Campes
1d8f859e74 finishes initial ui for the compact userlist 2016-08-25 17:50:37 +00:00