Chad Pilkey
ddb53b2f45
Merge remote-tracking branch 'upstream/master' into sort-raisehand-better
2014-08-25 11:40:24 -07:00
Chad Pilkey
5896e5d21e
hide delete button when presentation name is default.pdf
2014-08-25 11:39:51 -07:00
Richard Alam
beb22f55e5
- add more logging to figure out why callers using phone displays multiple times in users window
2014-08-25 10:44:07 -07:00
Chad Pilkey
c38e463e76
Merge remote-tracking branch 'upstream/master' into sort-raisehand-better
2014-08-25 09:57:42 -07:00
Chad Pilkey
bc0c27f683
allow ENTER in the whiteboard text, widen the language selector
2014-08-25 09:57:29 -07:00
Calvin Walton
614617c2b9
Add the 'mkclean' step for audio-only recordings
2014-08-25 11:22:55 -04:00
Richard Alam
260d41d297
- generate goto slide event when sharing a presentation
2014-08-25 08:14:19 -07:00
Calvin Walton
48735ccc70
Set the audio 'original duration' during initial events parsing
...
This is the point at which the start/stop events for the audio are
correctly matched up with eachother; doing it later can give
incorrect results if an 'end recording' event was missing from
the events file.
2014-08-25 10:48:17 -04:00
Richard Alam
3c28f36786
- initiate closing of applet from server side
2014-08-24 13:04:08 -07:00
Richard Alam
57b7de8b36
- stop sharing from server side instead of destroing the applet from the client side
2014-08-24 12:12:29 -07:00
Richard Alam
4cb7faaa49
- update localization
2014-08-24 11:02:00 -07:00
Fred Dixon
a374c59e30
Renamed 'WebRTC' -> 'WebRTC Audio' so users have a better chance of knowing what this indicator means
2014-08-23 21:57:03 -04:00
Fred Dixon
3b7c3894d4
Adjusted FireFox permissions image to give more prominence to the microphone
2014-08-23 19:11:35 -04:00
Fred Dixon
5e63dd31be
minor adjustment to record icon
2014-08-23 18:55:56 -04:00
Fred Dixon
35b3c6b1bf
Corrected wording in prompt for user to give permission to access microphone (FireFox)
2014-08-23 18:47:31 -04:00
Fred Dixon
04d291a785
Darkend the had to make it more visible in Users window
2014-08-23 18:44:17 -04:00
Fred Dixon
855891929f
Changed warning for LibreOffice not running (monit may not have started it yet)
2014-08-23 18:43:58 -04:00
Richard Alam
75889acd1d
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2014-08-23 14:53:51 -07:00
Richard Alam
6c857c04fa
- change log level for user join and leave so we can track them if the log level is above debug
2014-08-23 14:53:08 -07:00
Chad Pilkey
18ab0f1dd4
Merge remote-tracking branch 'upstream/master' into sort-raisehand-better
2014-08-23 14:32:22 -07:00
Chad Pilkey
46f5fcbfc7
fix strings in FirefoxMicPermission
2014-08-23 13:40:33 -07:00
Richard Alam
e4be6f5e1b
- remove go to page dialog
2014-08-23 13:22:34 -07:00
Richard Alam
9075068f8e
- allow a way to change log level externally from bigbluebutton.properties
2014-08-23 13:04:06 -07:00
Richard Alam
ba5b2d357f
Merge pull request #379 from SenecaCDOT-BigBlueButton/sort-raisehand-better
...
minor client updates
2014-08-23 15:35:19 -04:00
Chad Pilkey
8e9477bbe8
sort based on handraised, move strings to locale, minor tweaks to the audio dialogs
2014-08-23 12:31:28 -07:00
Richard Alam
edd070ef48
- implement eject user from meeting
2014-08-23 12:00:41 -07:00
Fred Dixon
9d37588495
Minor tweaks in language strings
2014-08-23 08:06:52 -04:00
Fred Dixon
16897a4d64
Merge pull request #378 from kepstin/recording-updates-merge
...
Fix the 'timestretch' fixup so that seeking is done after stretching
2014-08-22 17:09:18 -04:00
Calvin Walton
c1bb493c10
Fix the 'timestretch' fixup so that seeking is done after stretching
...
The previous version may have the beginning of the audio off by a bit,
since it was seeking in the audio file to find the start before the
stretch was applied.
2014-08-22 17:07:07 -04:00
Fred Dixon
23208a3b1b
Merge pull request #377 from kepstin/recording-updates-merge
...
Increase the audio bitrate in the video generation
2014-08-22 17:00:00 -04:00
Calvin Walton
e5b5b5d49d
Increase the audio bitrate in the video generation
...
Matches the corresponding change in the audio generation.
2014-08-22 16:58:31 -04:00
Richard Alam
e5b4dcc495
Merge pull request #376 from kepstin/recording-updates-merge
...
Recording updates merge
2014-08-22 16:45:23 -04:00
Calvin Walton
45162ce620
Explicitly use out0 in degenerate concat branch.
...
There is no i variable here, since there aren't multiple inputs to loop
over.
2014-08-22 16:43:35 -04:00
Calvin Walton
d53e7d21f3
Don't use the ffmpeg concat filter when only one audio segment
...
The concat filter requires at least 2 segments, it doesn't support
the degenerate case.
2014-08-22 16:41:16 -04:00
Richard Alam
d452b67d99
Merge pull request #375 from kepstin/recording-updates
...
Vorbis needs more bitrate for input with higher sample rate/stereo
2014-08-22 16:15:52 -04:00
Calvin Walton
0841dd4233
Vorbis needs more bitrate for input with higher sample rate/stereo
2014-08-22 16:14:35 -04:00
Richard Alam
e259b74670
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2014-08-22 12:47:28 -07:00
Richard Alam
97affb9874
- prevent multiple start/stop audio recording events
2014-08-22 12:47:15 -07:00
Richard Alam
e78f44ba04
Merge pull request #374 from kepstin/recording-updates
...
Use the correct timestamp for file start seek
2014-08-22 15:22:06 -04:00
Calvin Walton
2ac9de71a7
Use the correct timestamp for file start seek
2014-08-22 15:17:10 -04:00
Richard Alam
78dd7489d4
Merge pull request #373 from kepstin/recording-updates
...
Rewrite audio processing to use ffmpeg
2014-08-22 15:10:25 -04:00
Calvin Walton
7b205bdbf7
Rewrite audio processing to use ffmpeg
...
There's some fairly major changes here, including:
* All audio is resampled to 48kHz stereo on input, allowing files with
non-standard or varying rates to be mixed
* The audio processing is now done in a single pass; ffmpeg reads all
inputs, concatenates them, and outputs one file.
2014-08-22 15:04:14 -04:00
Richard Alam
bfe2153c2d
Merge pull request #372 from SenecaCDOT-BigBlueButton/record-reminder-icon
...
added record icon to the recording notification
2014-08-22 09:48:45 -04:00
Fred Dixon
55baf5b0be
Minor updates to prompts
2014-08-21 21:18:10 -04:00
Fred Dixon
8d3a2249f5
Updated default PDF with text on each blank page
2014-08-21 21:17:51 -04:00
Fred Dixon
854e581cd5
text changes to bbb-conf and index.html
2014-08-21 20:49:23 -04:00
Fred Dixon
4cb03c708d
Added example of moderator-only welcome message
2014-08-21 20:48:41 -04:00
syeshchenko
dae155c676
added record icon to the recording notification
2014-08-21 15:24:47 -07:00
Richard Alam
77dc5b1c1c
Merge pull request #371 from SenecaCDOT-BigBlueButton/upload-presentation-window-miscs
...
Properly resized upload presentation window, removed unnecessary text
2014-08-21 15:31:38 -04:00
syeshchenko
85d3e5f72a
properly resized upload presentation window, removed unnecessary text
2014-08-21 10:48:13 -07:00
