Commit Graph

6436 Commits

Author SHA1 Message Date
Richard Alam
8014f0a6e4 - disable stop button when poll has stopped 2013-09-24 16:01:00 +00: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
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
252d7129a7 - fix race condition where video share button doesn't show up somtimes when presenterShareOnly=true 2013-09-19 17:27:30 +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
9dcdedcf55 - fix issue where question is displayed as multiple choice when it's supposed to be multi-select 2013-09-13 18:24:14 +00:00
Richard Alam
1db314c60a - remove poll from display when deleted. 2013-09-13 17:51:29 +00:00
Richard Alam
300287e71d - just rename the directory 2013-09-13 15:37:25 +00:00
Richard Alam
817a86637f - add init.d script for bbb-callback 2013-09-13 15:34:51 +00:00
Richard Alam
8ac1beb606 - add show and hide poll result messages 2013-09-12 18:13:49 +00:00
Richard Alam
090f7e44d0 - automatically share presentation when completing conversion. This is a workaround where there is a race
condition between creating the meeting and processing pre-uploaded presentations.
2013-09-12 15:46:12 +00:00
Ubuntu
1dccf2fbb3 Merge branch 'master' into new-polling-feature 2013-09-11 19:28:12 +00:00
Ubuntu
be264746b8 Merge branch 'new-polling-feature' into redis-backed-bbb-live-data 2013-09-11 19:18:01 +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
Richard Alam
d402f7b333 Merge branch 'master'
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
2013-09-09 18:42:21 +00: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
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
Gustavo Salazar
283c02216d Merge pull request #238 from SenecaCDOT-BigBlueButton/add-user-window-options
added enableHandRaise and enableSettingsButton as config.xml options for...
2013-08-26 10:44:23 -07:00
Calvin Walton
ca9a4c2b92 Bump the max difference for audio stretch up to 5% 2013-08-26 13:33:23 -04:00
Calvin Walton
0473682137 Reset the offset to 0; the new scripts seem to have better sync? 2013-08-26 13:23:49 -04:00
Calvin Walton
c2884bdb9d Add missing license header to edl.rb 2013-08-26 11:44:22 -04:00
Calvin Walton
7c7540a0de Add a video quality bump when deskshare videos are present. 2013-08-26 11:27:53 -04:00
Calvin Walton
42e195bbe8 Rewrite the audio/video encoding components for BigBlueButton.
I've been working on this for a while, and it's adapted from code that
has been fairly well-tested on a wide variety of recordings. I've found
it to do a more accurate job of combining multiple webcam files, and it
should be more accurate in the audio as well.

Another key feature is that it does fewer re-encoding steps during video
processing, which should both speed it up and hopefully improve quality.
The settings on the VP8 encoder have been tuned somewhat as well.
2013-08-26 11:20:33 -04:00
Felipe Cecagno
412384745f Merge branch 'master' into language-button-usability-0.81 2013-08-25 23:34:30 -03:00