BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,667 Commits 13 Branches 260 Tags 1.1 GiB
8a97afb89e
Commit Graph

11667 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas Zawacki
92d5aaf5d0 Remove extra calls to updateVoiceUser in user mute/unmute 
This is supossed to be called when handling messages from the redis queue
and when called here would cause errors because it had no callback function.

The correct way is not calling it here, but handling the muting/unmiting when
receiving messages (which is already done).
 2016-03-02 12:44:34 -03:00
Fred Dixon
5b8531bb5f Merge pull request #3032 from ffdixon/fix-bbb-conf-2 
Fixed on bug in matching for http/https
 2016-02-28 18:59:31 -05:00
Fred Dixon
1f7023cd06 Fixed on bug in matching for http/https 2016-02-28 18:58:25 -05:00
Fred Dixon
07bdba35e2 Merge pull request #3031 from ffdixon/add-https-bbb-conf 
Updates to bbb-conf to support HTTPS configuration
 2016-02-28 18:31:20 -05:00
Fred Dixon
539d70a993 Updates to bbb-conf to support HTTPS configuration 2016-02-28 18:30:09 -05:00
Fred Dixon
3ab8baf478 Merge pull request #3030 from ffdixon/update-demos-https 
Update API demos to work with https
 2016-02-28 14:02:36 -05:00
Fred Dixon
39c397b05a Update API demos to work with https 2016-02-28 13:59:45 -05:00
Oleksandr Zhurbenko
849fad0455 Made html5 chat working with react 2016-02-26 19:17:11 -08:00
Richard Alam
6c9ab887d5 - we are seeing redis sub reconnecting because of exception on null emoji status in akka-apps. 
set the emojistatus to "none" (default) when it is null
 2016-02-26 18:30:58 -05:00
Richard Alam
ec6b9cc6a7 Merge pull request #3028 from pedrobmarin/issue-2892 
Added missing div to fix WebRTC audio for JavaScript API demo
 2016-02-26 13:38:33 -05:00
Pedro Beschorner Marin
ca5f974bde Added missing div to fix WebRTC audio for JavaScript API demo 2016-02-26 18:27:42 +00:00
Fred Dixon
639b206418 Merge pull request #3026 from ffdixon/fix-flash-player-gif 
Fix missing get_flash_player.gif error message in nginx logs
 2016-02-26 07:21:44 -05:00
Fred Dixon
de9ba3e0a9 Fix missing get_flash_player.gif error message in nginx logs 2016-02-26 07:20:25 -05:00
Oleksandr Zhurbenko
ace43d18ab Visibility helper is not used anymore 2016-02-22 15:24:03 -08:00
Richard Alam
09da04a4f0 Merge pull request #3020 from antobinary/fix-3012 
fix for #3012 no presenter after ex-presenter kicked
 2016-02-22 10:07:27 -05:00
Anton Georgiev
107fa7c07a fix for #3012 no presenter after ex-presenter kicked 2016-02-19 16:52:56 +00:00
Fred Dixon
e6e0e60cf9 Merge pull request #3018 from jfederico/master 
The new directory [deleted] is now included when deleting recordings with bbb-record
 2016-02-18 17:00:20 -07:00
Chad Pilkey
9b4e264d1d Merge pull request #3016 from tdj-br/master 
Fix bigbluebutton/bigbluebutton#2710
 2016-02-18 17:41:52 -05:00
Tiago Daniel Jacobs
ac1990f426 Fix bigbluebutton/bigbluebutton#2710 (attempt 2) 2016-02-18 01:49:17 -02:00
Tiago Daniel Jacobs
f8c050aa25 Fix bigbluebutton/bigbluebutton#2710 2016-02-16 23:17:32 -02:00
jfederico
0d017dc265 bigbluebutton-config: Included the new directory [deleted] in shell for managing recordings 2016-02-16 15:14:46 -05:00
Richard Alam
4bfa67f4c4 Merge pull request #3015 from jfederico/master 
Fix for bugs related to new states for recordings
 2016-02-16 10:35:45 -05:00
jfederico
932f66e47b bigbluebutton-web: Prevented apiController to crash if in a getRecordings request the metadata.xml fiel doesn't exist 2016-02-12 12:48:26 -05:00
jfederico
503b748b22 record-and-playback: Placed code for producing the initial metadata.xml file at the top 2016-02-12 12:08:33 -05:00
jfederico
3bb127ed88 bigbluebutton-web: Validated nulls and empty strings in new template for getRecordings 2016-02-12 12:07:20 -05:00
Richard Alam
f71cfe343c Merge pull request #3011 from jfederico/master 
Fix for bug in scripts for processing recordings
 2016-02-09 17:56:20 -05:00
jfederico
0c2eaf5f11 record-and-playback: Fixed bug in original state of recordings. 2016-02-09 17:26:29 -05:00
Jesus Federico
3346a93a72 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2016-02-09 13:31:45 -08:00
Richard Alam
5189dd684a Merge pull request #3010 from capilkey/fix-3009 
Show chat options tab when private chat disabled
 2016-02-09 14:23:18 -05:00
Chad Pilkey
7687d9dd00 show chat options tab when private chat disabled 2016-02-09 11:15:17 -08:00
Fred Dixon
a9c9b6fe57 Merge pull request #3008 from capilkey/fix-emoji-tooltips 
Cleaned up undefined emoji strings
 2016-02-08 18:21:18 -05:00
Chad Pilkey
9e0c169c5d removed undefined emoji tooltip strings 2016-02-08 15:09:05 -08:00
Richard Alam
6eb7c446e1 Merge pull request #3007 from capilkey/1.0-access-bugfix1 
Four minor accessibility fixes
 2016-02-08 17:22:36 -05:00
jfederico
f92200c692 bigbluebutton-web: On changeState, create the directory named by the pathname, including any necessary but nonexistent parent directories. 2016-02-08 16:59:38 -05:00
jfederico
c40f499b94 bigbluebutton-web: Closed DirectoryStream after the directory is processed 2016-02-08 16:48:40 -05:00
Chad Pilkey
9264f50ae5 adjusted the ShortcutWindow sizing 2016-02-08 13:07:47 -08:00
Chad Pilkey
d5db28ac3c removed unused functions from JS 2016-02-08 13:07:08 -08:00
Chad Pilkey
c40087ffac fixed some html labelling in the client 2016-02-08 13:06:34 -08:00
Chad Pilkey
addfe4e502 increase contrast on some font colours 2016-02-08 13:02:00 -08:00
Fred Dixon
fdb9e11562 Merge pull request #3006 from ffdixon/lower-latency-video-profile 
Added Low Latency (h.263) option to profiles.xml. 

While turning off h.264 encoding reduces quality, it also reduces latency.  The use case for this profile is instruction that requires lower latency such as music training.
 2016-02-08 12:15:20 -05:00
Fred Dixon
f1d322f3e2 Added Low Latency (h.263) profile 2016-02-08 12:11:48 -05:00
Fred Dixon
8183072337 Merge pull request #3005 from bigbluebutton/ffdixon-bump-copyright-date 
Update index.html
 2016-02-06 13:55:50 -05:00
Fred Dixon
4f73858521 Update index.html 
Bump the copyright date.
 2016-02-06 13:55:43 -05:00
Richard Alam
1bb029fb1b Merge pull request #3003 from ritzalam/fix-issue-2812-v2 
- fix issue 2812 by setting end time when last user leaves
 2016-02-04 17:43:26 -05:00
Richard Alam
40ba49113e - fix issue 2812 by setting end time when last user leaves 2016-02-04 22:40:06 +00:00
Richard Alam
c31857b9da Merge pull request #3001 from bigbluebutton/getRecordings-merged-enhancements 
Get recordings merged enhancements
 2016-02-04 17:01:03 -05:00
Richard Alam
1e0be140a2 Change API version to 1.0 2016-02-04 14:43:59 -05:00
Richard Alam
5d2ab077cb Merge pull request #2999 from ritzalam/make-desktop-sharing-stop-when-tunneling 
- desktop sharing doesn't stop when the applet is tunneling. Catch t…
 2016-02-04 14:20:38 -05:00
Richard Alam
328c948156 Merge pull request #2997 from capilkey/fix-2437-regression 
Put the fix for #2437 back in
 2016-02-04 14:19:24 -05:00
Richard Alam
dbf02ba36e - desktop sharing doesn't stop when the applet is tunneling. Catch the exception and stop the applet. 2016-02-04 19:13:47 +00:00