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

12645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Dixon
c3de0a9cde Merge pull request #2976 from bigbluebutton/ffdixon-fix-api-link 
Update demo_footer.jsp with correct link to API docs
 2016-01-25 07:45:42 -05:00
Fred Dixon
941caa06d5 Update demo_footer.jsp 2016-01-25 07:45:18 -05:00
Oleksandr Zhurbenko
cc7f8b4fac Updating the new slide's ratios and offsets right away 2016-01-22 22:51:41 -08:00
Chad Pilkey
416cbbf7bc Merge pull request #2973 from capilkey/1.0-minor-fixes 
Minor UI changes for the Flash client
 2016-01-22 19:25:19 -05:00
Chad Pilkey
d90643fc77 update the client copyright to 2016 2016-01-22 16:12:54 -08:00
Oleksandr Zhurbenko
0f7f3ed7b8 Added check to see if the properties have been already updated by displayThisSlide() after receiving a presentation_page_changed message. 2016-01-22 15:53:24 -08:00
Chad Pilkey
f7f6d81a37 shorten the copyright string in the client footer 2016-01-22 15:53:16 -08:00
jfederico
2c214cafac bigbluebuttonbn-web: Implemented filter for recordIDs [id:eq:xxxx,yyyy,zzzz] 2016-01-22 18:16:47 -05:00
Chad Pilkey
4062aa02db significantly reduce the volume of the chat audio cue 2016-01-22 15:02:12 -08:00
Chad Pilkey
a2203ad5e6 unbold the lock settings categories in the popup 2016-01-22 14:52:45 -08:00
Chad Pilkey
d34616d3d2 add separation between chat time and border 2016-01-22 14:50:10 -08:00
Chad Pilkey
75cb6b66cc Merge pull request #2969 from tdj-br/master 
Fixes #2768
 2016-01-22 16:41:14 -05:00
RafaFP
19bae41130 Added redis messages for the events of Publish, Unpublish and Remove recordings triggered by the API calls. 
refs #1693
 2016-01-22 20:47:34 +00:00
Richard Alam
3273912bd1 Merge pull request #2968 from ritzalam/expire-redis-keys-after-14-days 
Expire redis keys after 14 days
 2016-01-22 14:29:25 -05:00
Oleksandr Zhurbenko
6eb3fbe50d Removed old unused console logs from the code. 2016-01-22 11:14:57 -08:00
Richard Alam
5c882386cd Merge pull request #2972 from pedrobmarin/issue-2851 
Avoid scala warning messages
 2016-01-22 14:14:37 -05:00
Oleksandr Zhurbenko
8fdb83d01a Assigning widthRatio to default value when the currentSlideDoc is not loaded yet. Removing errors from the console. 2016-01-22 11:07:14 -08:00
Pedro Beschorner Marin
8890f46910 - avoid scala warning messages 2016-01-22 19:00:50 +00:00
Richard Alam
78cfccab18 Merge pull request #2971 from pedrobmarin/issue-2851 
Simple modification to avoid multiple start audio recording events
 2016-01-22 13:38:12 -05:00
Pedro Beschorner Marin
086e339653 Simple modification to avoid multiple start audio recording events 2016-01-22 16:43:17 +00:00
jfederico
6b911820e0 bigbluebutton-web: Added filter parameter to getRecordings for filtering queries based on the state of the recording [published|unpublished|deleted] 2016-01-22 11:38:33 -05:00
Tiago Daniel Jacobs
fc728bf1be Fixes #2768 2016-01-21 22:56:48 -02:00
Richard Alam
5c812984ad Merge pull request #2967 from ritzalam/improve-pdf2swf-conversion 
Improve pdf2swf conversion
 2016-01-21 15:59:10 -05:00
Richard Alam
f501fb5803 - expire redis recording keys after 14 days 2016-01-21 20:43:28 +00:00
Richard Alam
6956ddf723 - do not record events if the meeting is not recorded 2016-01-21 20:42:47 +00:00
jfederico
3265709455 bigbluebutton-web: Extended getRecordings for making direct searches based on recordID(s) 2016-01-21 15:24:22 -05:00
Oleksandr Zhurbenko
f287f5f4cb Simply updating data in the Slides collection instead of removing and adding whole objects 2016-01-21 10:29:18 -08:00
Richard Alam
e7a46aa3cf - cleanup formatting 2016-01-21 17:31:25 +00:00
Richard Alam
0b898d0d29 - change how we process upload presentation. Before, an uploaded presentation consumes all of the 
presentation conversion threads. If the presentation takes a lot of time and cpu to convert,
   other uploaded presentations gets queued up and cannot be processed in parallel.
 2016-01-21 17:24:13 +00:00
Leonardo Crauss Daronco
af645999cb Webhooks: use events to keep track of audios and videos in a conference 
Added to the default list of events the events triggered when a user
joins/leaves the voice conference and when shares/unshares a webcam.
 2016-01-21 14:17:15 -02:00
jfederico
65a2b6d16c bigbluebutton-web: Implemented the new state [deleted] for recordings 2016-01-21 11:12:33 -05:00
Oleksandr Zhurbenko
8d18271579 Enabling whiteboard helpers 2016-01-20 16:41:05 -08:00
Chad Pilkey
58292b198d Merge pull request #2964 from ritzalam/do-not-reconnect-when-user-kicked 
Do not reconnect when user kicked
 2016-01-20 11:55:49 -05:00
Richard Alam
726e9e1fb0 - change wording on logout window when a user gets kicked out of the meeting. 2016-01-20 15:21:55 +00:00
Oleksandr Zhurbenko
5c9b42fb0f Removed the duplicated call of the displayThisSlide() 2016-01-19 15:04:00 -08:00
jfederico
ca88c05dde bigbluebutton-web: corrected identation to RecordingService.java 2016-01-19 15:50:12 -05:00
jfederico
2abb0acbc1 bigbluebutton-web: Updated state when recording is published/unpublished 2016-01-19 15:39:10 -05:00
jfederico
91b0e54600 bigbluebutton-web: RecordingService process a new directory 'deleted' that represents a new state for processed recordings 2016-01-19 15:19:36 -05:00
jfederico
334d4e4beb bigbluebutton-web: Added state to xml responded by getRecordings 2016-01-19 15:16:45 -05:00
jfederico
67a70ccbc3 bigbluebutton-web: Reformatted code in apiController 2016-01-19 15:15:18 -05:00
jfederico
374982254e bigbluebutton-web: Modified Config.groovy to allow log messages from controllers and services to be shown 2016-01-19 15:02:39 -05:00
jfederico
371557ecb4 recording-and-playback: Added directory to be cleaned up for deleted status 2016-01-19 14:57:30 -05:00
jfederico
8e3c0ea983 recording-and-playback: Changed initial state on recording metadata.xml to published 2016-01-19 14:53:33 -05:00
jfederico
8bc75ab2f6 recording-and-playback: Converted tabs to spaces on presentation/scripts/* and core/scripts/* 
Signed-off-by: jfederico <jesus@123it.ca>
 2016-01-19 14:52:28 -05:00
Felipe Cecagno
a0aff7b3fc Merge pull request #2951 from LucasMFreire/fix-video-windows 
Fixed unclosed video windows bug
 2016-01-19 16:38:56 -02:00
Felipe Cecagno
93620df0b8 implement the same protection we did for publish on view 2016-01-19 16:32:05 -02:00
Richard Alam
36cff83b6f - tell user that he has been ejected from the meeting. 2016-01-19 16:58:14 +00:00
Richard Alam
c66c180040 - make the flash client not attempt to reconnect when the user has been ejected from the meeting. 2016-01-19 16:16:12 +00:00
Jesus Federico
1cb3fe6601 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2016-01-19 07:34:34 -08:00
Fred Dixon
2b06f71031 Merge pull request #2963 from ffdixon/logout-message 
Updated text for logout message:
 2016-01-19 08:58:27 -05:00