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

6267 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Gustavo
d8e1bce801 Update locales 2013-09-23 20:46:29 +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
c1d30dc72b - add config param to skip camera settings check 2013-09-23 15:24:07 +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
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
fc4382d626 - fix problem where no one can share when presenterShareOnly is set to TRUE 2013-09-16 21:27:47 +00:00
Richard Alam
9f8f7fa419 Merge pull request #251 from SenecaCDOT-BigBlueButton/fix-issue-1611 
removed the colour change from the chat item renderer and improved the layout when there's a long name
 2013-09-11 12:00:13 -07:00
Chad Pilkey
dfe2bfd6de removed the colour change from the chat item renderer and improved the layout when there's a long name 2013-09-09 14:27:10 -07:00
Fred Dixon
6b95448865 Merge pull request #249 from SenecaCDOT-BigBlueButton/fix-logout-window-localisation 
added two strings in the log out window to locales
 2013-09-04 15:11:04 -07:00
Chad Pilkey
dfc444ab6f added two strings in the log out window to locales 2013-09-04 15:01:23 -07:00
Nadia Noori
c2c344ed79 Changing lable to RC1 2013-09-04 14:24:19 -04:00
Richard Alam
d514465e3b Merge pull request #246 from bigbluebutton/fix-logout-url-call 
Logout URL was never called when API signOut call fail.
 2013-09-04 08:26:26 -07:00
Fred Dixon
be5c2c5433 Merge pull request #248 from SenecaCDOT-BigBlueButton/fix-chattab-localization 
Fix chattab localization
 2013-09-03 15:36:33 -07:00
Chad Pilkey
e8ef9f3b1a added check to make sure tabs exist 2013-09-03 15:34:45 -07:00
Chad Pilkey
6ab6ec3ec3 the Public and Option chat tabs now match the selected locale at all times 2013-09-03 15:24:52 -07:00
Gustavo Salazar
2007d6d7bb delete transifex dir in locales 2013-09-02 13:59:36 -05:00
Gustavo Salazar
214cef8c1c Merge pull request #247 from jent46/master 
Update locales
 2013-09-02 11:05:42 -07:00
jent46
8e8e162c7c Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-09-02 10:45:34 -07:00
jent46
8561c02d18 update locales 2013-09-02 10:44:52 -07:00
Tiago Daniel Jacobs
3d9cd8b63d Logout URL was never called when API signOut call fail. 2013-08-30 21:17:44 -03:00
Fred Dixon
7949c6af9a Merge pull request #245 from jent46/master 
fix issue in the demo10_helper.
 2013-08-30 17:06:35 -07:00
jent46
d1021d07b7 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-08-30 16:44:17 -07:00
firstuser
e48874637e Change the GetRecording for demo 10 2013-08-30 16:41:45 -07:00
Chad Pilkey
2d8b797d72 Merge pull request #241 from mconf/language-button-usability 
Fixed the style of the language selector
 2013-08-30 14:41:20 -07:00
Fred Dixon
45756a8260 Merge pull request #244 from kepstin/bbb-demos-warning 
Add a big fat warning about the implications of leaving demos installed.
 2013-08-30 14:18:10 -07:00
Calvin Walton
25dff30213 Add a big fat warning about the implications of leaving demos installed. 2013-08-30 17:03:54 -04:00
Gustavo Salazar
abc30ff955 Merge pull request #243 from kepstin/recording-rewrite 
Recording rewrite
 2013-08-30 10:42:03 -07:00
Chad Pilkey
118bf3c055 Merge pull request #240 from mconf/fix-you-chat 
Removing the hardcoded "you" from the private chat selector
 2013-08-29 12:36:11 -07:00
Felipe Cecagno
5d1e6db4d0 Merge branch 'master' into language-button-usability 2013-08-29 16:03:50 -03:00
Felipe Cecagno
5c8d19ca8f the user private chat selector was still using the hardcoded "you" instead of using the localized string of the users module, I just applied the same string here 2013-08-29 15:56:51 -03:00
Felipe Cecagno
ccb29c30eb setting up the language selector style; fixed identation 2013-08-29 14:51:31 -03:00
Guilherme Augusto Dias
78c77fb362 Create timestamp attribute 
Shape tags have a timestamp attribute (id attribute no longer includes timestamp information).
 2013-08-28 17:51:06 +00:00
Calvin Walton
2b5aab3224 Change the background color of the video area to white to match 
The new scripts render the videos over white, so you get occasional
black bits sneaking in without this.
 2013-08-27 11:27:13 -04:00
Calvin Walton
5267a7d2e1 Update the ffmpeg version check in bbb-conf 2013-08-27 11:04:02 -04:00