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

6793 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
d8ae699a36 - update gradle build 2013-09-27 17:43:32 +00:00
Fred Dixon
91493dc624 fixed small bug in bbb-conf --setip for LTI 2013-09-26 17:19:47 -04:00
Fred Dixon
a84c6ca8e8 Configuration updates for moving to 0.81-RC2 2013-09-26 16:42:27 -04:00
Felipe Cecagno
322176ddf3 Merge branch 'record-button' of https://github.com/guilhermedias/bigbluebutton into record-button 
Conflicts:
	record-and-playback/presentation/scripts/publish/presentation.rb
 2013-09-26 13:06:15 -03:00
Guilherme Augusto Dias
99b17e6f58 Change shape timestamps generation 
The timestamps of shapes drawn during a non recording period are being correctly generated.
 2013-09-26 13:32:55 +00:00
Felipe Cecagno
4abf4f76d4 if the slide time is 0 and you click on his thumbnail, you will want to see &t=0s, not &t= 2013-09-25 01:32:16 -03:00
Felipe Cecagno
bce20f4112 fixed the issue commented on the previous commit, about losing the recording flag when the last participant leaves the room 2013-09-25 01:27:32 -03:00
Felipe Cecagno
32b52fefb8 start and stop recording marks are being considered in all medias (audio, video and deskshare); still needs to figure out the inconsistency when the last participant leaves the conference while it's being recorded, but couple of seconds later another participant joins the meeting; the problem is that after the last user leaves the conference, the scope is deleted so the recording flag is lost, and when the scope is created again, the recording flag has the default value, that is false; also, what should we do if the user doesn't click on the recording button? how to differentiate recordings made in a version with or without the recording button? 2013-09-25 00:34:15 -03:00
Felipe Cecagno
09657c206c fixed the exceptions thrown when an Alert box is showed 2013-09-24 18:03:58 -03:00
Felipe Cecagno
cf8b31591c this commit is an unfinished work; the new code that generates the audio and video files in the recording is being adapted to take into account the recording marks; the audio is done, but video and desktop sharing is still missing 2013-09-24 18:03:12 -03:00
Felipe Cecagno
aa597fe985 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into record-button-client 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
	record-and-playback/core/lib/recordandplayback.rb
	record-and-playback/core/lib/recordandplayback/generators/audio_processor.rb
	record-and-playback/core/lib/recordandplayback/generators/events.rb
	record-and-playback/core/lib/recordandplayback/generators/video.rb
	record-and-playback/presentation/scripts/publish/presentation.rb
 2013-09-24 15:03:44 -03:00
Richard Alam
920c56d7f1 - loclalize buttons 2013-09-24 16:31:59 +00:00
Richard Alam
8014f0a6e4 - disable stop button when poll has stopped 2013-09-24 16:01:00 +00:00
Richard Alam
597c64e808 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-09-24 15:39:40 +00:00
Richard Alam
aa018fcb21 - use default resolution from config.xml when skipping webcam settings check 2013-09-24 15:38:52 +00:00
Fred Dixon
0b9cfb591c Merge pull request #263 from gugat/bbbrecord081 
update bbb-record utility
 2013-09-23 17:42:16 -07:00
Gustavo
0390c2c3c4 bbb-record update version 2013-09-23 23:16:04 +00:00
Gustavo
3e01ab5d29 republish only for matterhorn integration 2013-09-23 23:15:07 +00:00
Gustavo
6acbc14103 separate rebuild and rebuild all 2013-09-23 22:36:53 +00:00
Gustavo
d03114846a angle brackets for params 2013-09-23 21:51:46 +00:00
Fred Dixon
d9bfdaeb73 Merge pull request #262 from gugat/locales08 
Update locales
 2013-09-23 14:47:07 -07:00
Felipe Cecagno
33d98bbff2 implemented the record button both client-side and server-side; still needs more work on the processing scripts; still needs to update the record button icons 2013-09-23 18:33:30 -03:00
Richard Alam
b0d04b04e6 - hook up display poll result button 2013-09-23 21:00:34 +00:00
Richard Alam
f334a49a31 - disable delete, start, edit buttons depending on the state of the poll 2013-09-23 20:49:41 +00:00
Gustavo
d8e1bce801 Update locales 2013-09-23 20:46:29 +00:00
Richard Alam
4bc735e1ef Merge branch 'upgrade-to-grails-2.3' into embed-flash-client-in-another-app 2013-09-23 20:42:50 +00:00
Richard Alam
b1ae469c8a - skip check for cam setting even when starting sharing manually 2013-09-23 19:22:34 +00:00
Richard Alam
f2ce380a57 - skip check for cam setting even when starting sharing manually 2013-09-23 19:20:09 +00:00
Richard Alam
8a137a61ae Merge branch 'master' into new-polling-feature 2013-09-23 15:56:32 +00:00
Richard Alam
c1d30dc72b - add config param to skip camera settings check 2013-09-23 15:24:07 +00:00
Richard Alam
129b281982 - star refactoring meeting service 2013-09-20 21:12:23 +00:00
Richard Alam
e173bfe682 - cleanup 2013-09-20 20:21:34 +00:00
Richard Alam
f851cbc449 - add build file 2013-09-20 19:50:02 +00:00
Richard Alam
827709edd1 - add .gitignore 2013-09-20 19:49:40 +00:00
Richard Alam
9616b073c9 - add .gitignore to meeting-service project 2013-09-20 19:48:58 +00:00
Richard Alam
e3cb7f3368 - remove .gitignore from ignored files as it ignores .gitignore files in children dirs 2013-09-20 19:47:49 +00:00
Richard Alam
ae15249281 - extract meeting classes from bbb-web 2013-09-20 19:38:48 +00:00
Richard Alam
f6b5959992 Merge branch 'master' into embed-flash-client-in-another-app 2013-09-19 21:27:52 +00:00
Felipe Cecagno
9c512931e0 starting to implement the client-side of the record button; nothing yet was modified on bigbluebutton-apps 2013-09-19 17:53:48 -03:00
Felipe Cecagno
b5b81c1c4d refactored a little bit the function translateTimestamp; the images that are never displayed aren't included on the svg file anymore; still have to figure out the issue with the shapes made BEFORE start the recording - for now we cannot differentiate shapes made on the current slide and the ones made on a previous slide before start the recording 2013-09-19 15:22:22 -03:00
Richard Alam
252d7129a7 - fix race condition where video share button doesn't show up somtimes when presenterShareOnly=true 2013-09-19 17:27:30 +00:00
Felipe Cecagno
54a34b4475 Merge branch 'record-button' of github.com:fcecagno/bigbluebutton into record-button 
Conflicts:
	record-and-playback/core/lib/recordandplayback/generators/events.rb
 2013-09-18 18:02:18 -03:00
Felipe Cecagno
237268424f the timestamps of the recording events are normalized now, matching the recording marks; still need more testing when there are multiple start-stop recording events; the whiteboard actions are already working, including the slides, but slides that are outside of the recording period are still being loaded in the svg file (#TODO) 2013-09-18 17:54:51 -03:00
Richard Alam
9d0fa68ed7 - add the dependency jars 2013-09-18 18:41:50 +00:00
Richard Alam
7b3a6b9054 - setup a new bbb-web-api project for grails 2.3 2013-09-18 18:41:02 +00:00
Guilherme Augusto Dias
1bd0d7ee4a Draw multiple shapes 
Playback script supports drawing multiple shapes at the same time
 2013-09-18 17:59:13 +00:00
Richard Alam
dd367c2941 Merge branch 'master' into upgrade-to-gradle-1.7 2013-09-17 18:13:11 +00:00
Richard Alam
a939588df8 - upgrade to gradle 1.7 
STEPS
cd ~/dev/tools
wget http://services.gradle.org/distributions/gradle-1.7-bin.zip
unzip gradle-1.7-bin.zip
ln -s gradle-1.7 gradle
vi ~/.profile

export GRADLE_HOME=$HOME/dev/tools/gradle
export PATH=$PATH:$GRADLE_HOME/bin

source ~/.profile
 2013-09-17 18:10:52 +00:00
Richard Alam
fc4382d626 - fix problem where no one can share when presenterShareOnly is set to TRUE 2013-09-16 21:27:47 +00:00
Richard Alam
35ae1a5720 - cleanup and add header 2013-09-16 20:57:06 +00:00