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

11735 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghaz Triki
45362941ce Use first sessionToken implementation in API. 2016-03-02 21:16:26 +01:00
Anton Georgiev
d89f51f392 Merge pull request #3034 from lfzawacki/user-voice-plus-emojis 
HTML5: Small corrections to userUpdateVoice and emoji refactoring
 2016-03-02 15:01:41 -05:00
Lucas Zawacki
85a0fda657 Correct Meteor.log for unsupported json messages 2016-03-02 15:44:25 -03:00
Lucas Zawacki
72591a6e9d Refactor icons to make it easier to extend and modify 2016-03-02 12:48:29 -03:00
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
Ghaz Triki
871843d4ec Fix session token redirection merge. 2016-03-02 12:39:57 +01:00
Ghaz Triki
3f89ff28d9 Merge branch 'master' into breakout-rooms-porto-algre-2015 2016-03-02 11:23:38 +01: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
Ghaz Triki
990e786340 Merge branch 'master' into breakout-rooms-porto-algre-2015 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
#	bigbluebutton-web/.classpath
#	bigbluebutton-web/.settings/org.eclipse.jdt.core.prefs
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
#	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-02-28 21:34:33 +01: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
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
Ghaz Triki
7e759d35c5 Revert back the breakout rooms label once all rooms have been closed. 2016-02-23 18:58:49 +01:00
Ghaz Triki
93140364f9 Display breakout room timer in the parent room. 2016-02-23 17:47:25 +01:00
Ghaz Triki
9adc9c626c End all breakout rooms whenever the parent room is programatically ended. 2016-02-23 11:10:34 +01: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
Ghaz Triki
d6c49af4f4 Updated freeswitch configuration default user flag to "nomoh", no music on hold when this member is the only member in the conference. 2016-02-16 19:04:23 +01:00
Ghaz Triki
b08ebb308a Fixe the case where the breakout room document conversion is triggered before the actor is brought to life. 2016-02-16 17:45:42 +01: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
Ghaz Triki
87a45faa6e When a breakout room is created, all participants are muted except the one who have triggered the breakout rooms creation. 2016-02-15 19:57:08 +01:00
Ghaz Triki
7d15545604 The moderator who is creating breakout rooms autoatically goes to the unassigned users list. 2016-02-15 19:27:34 +01: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
Ghazi Triki
ed7a0e6bdb Updated client locales. 2016-02-10 17:30:43 +01:00
Ghazi Triki
bbd08ed960 Added TimerUtil.as class. 2016-02-10 17:23:43 +01:00
Ghazi Triki
6844ce396e Display breakout room timer in the chat box. 2016-02-10 15:23:52 +01:00
Ghazi Triki
78af9a5030 Remaining time for the breakout room is calculated in seconds instead of minutes. 2016-02-10 15:23:44 +01: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