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

6453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
8d703cebd5 - remove tracking of how many unread private tabs a user has as we don't really need that level of detail 
- fix: https://code.google.com/p/bigbluebutton/issues/detail?id=1640
 2013-10-08 19:05:03 +00:00
Richard Alam
3b00657b9d - fix issue where viewer stop sharing webcam when switching presenter 
https://code.google.com/p/bigbluebutton/issues/detail?id=1641
 2013-10-08 18:22:08 +00:00
Felipe Cecagno
6e0553ed7c Merge branch 'record-button' of github.com:guilhermedias/bigbluebutton into record-button 
Conflicts:
	record-and-playback/presentation/scripts/publish/presentation.rb
 2013-10-07 22:36:31 -03:00
Guilherme Augusto Dias
8c89024084 Fix issue in multi-segment recording 
Correctly draw shapes in multi-segment recordings.
 2013-10-07 20:08:14 +00:00
sokie
1ae8876072 Fixed broadcast module not showing for clients, multiple windows opening for presenter and stream not playing if joining once the stream was started 2013-10-07 18:30:32 +02:00
Felipe Cecagno
d9dfe4a5d0 fixed partially the issue with the shapes timestamp made after the first period of recording, there's still work to do 2013-10-04 16:52:53 -03:00
Richard Alam
92a31599f9 Merge pull request #270 from kepstin/presentation-resiliance 
Make generation of png images for pdf pages more resiliant.
 2013-10-04 12:50:22 -07:00
Calvin Walton
420b0b5573 Make generation of png images for pdf pages more resiliant. 
We now use ghostscript to output pngs directly from the original pdf,
rather than using convert on the split pages. This should make corrupt
or strange pdfs less likely to cause issues.

As well, if a pdf page conversion fails (for any reason, including that
the original pdf is missing...) it will be logged, and a blank page
generated, and processing will continue.
 2013-10-04 15:25:13 -04:00
Felipe Cecagno
f49091c260 Merge branch 'record-button' of https://github.com/guilhermedias/bigbluebutton into record-button 2013-10-04 11:26:48 -03:00
Felipe Cecagno
94df8080b8 fixed record button alert position 2013-10-04 11:24:05 -03:00
Felipe Cecagno
8830951ac0 to specify the duration on ffmpeg we use -t instead of -to 2013-10-04 11:04:21 -03:00
Felipe Cecagno
00d0eb7b43 we only to the match between the video events and the record status events AFTER the webcam and deskshare merge 2013-10-04 11:03:49 -03:00
Richard Alam
b2305c7fe2 Merge pull request #268 from gugat/matterhorn_081 
fixes audio  extension problem in matterhorn
 2013-10-03 12:56:54 -07:00
Gustavo Salazar
5dff55fb13 remove audio extension in webcam processing for matterhorn 2013-10-03 13:50:31 -05:00
Guilherme Augusto Dias
9d1dd1d8d2 Fix shape/image matching test 
Fix iteration range when checking if a shape is within an image
 2013-10-02 22:32:16 +00:00
Guilherme Augusto Dias
1b6c5a5b58 Highlight thumbnail 
The thumbnail of the first slide starts highlighted
 2013-10-02 22:31:10 +00:00
Richard Alam
60b43f6d36 Merge pull request #267 from gugat/locales 
update locales
 2013-10-02 12:12:20 -07:00
Gustavo Salazar
d673e6e484 update locales 2013-10-02 12:12:40 -07:00
Felipe Cecagno
2572d5eb7a positioned the record button near the other control buttons at the left size 2013-10-02 14:29:57 -03:00
Felipe Cecagno
d8b3375f48 we don't want to archive recordings in which there's no mark to start the recording; it would be the same as if the meeting would be created with record=false - the only difference is that the events are archived to recordings/raw/meeting_id/events.xml, and the recorded .done flag is created as well 2013-10-02 14:18:26 -03:00
Fred Dixon
6e5b15e1f0 Merge pull request #266 from gugat/matterhorn_081 
matterhorn scripts work with new version of ffmpeg
 2013-10-01 16:06:46 -07:00
Gustavo Salazar
ca6e32bc93 separate scaling and padding commands for deskshare 2013-10-01 17:11:23 -05:00
Gustavo Salazar
cfc6b3385b set sample rate 2013-10-01 17:05:55 -05:00
Gustavo Salazar
c5e4820f25 don't pass the file extension 2013-10-01 17:02:36 -05:00
Gustavo Salazar
5d5d135557 set video quality 2013-10-01 16:53:39 -05:00
Fred Dixon
6b7438e9f8 Updated wording of welcomeMessageFooter 2013-09-27 19:01:59 -04:00
Guilherme Augusto Dias
00d4c69f78 Fix audio processing issue 
Fix an issue that occurs on processing recordings with no audio
 2013-09-27 19:26:33 +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
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
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