Commit Graph

6121 Commits

Author SHA1 Message Date
Calvin Walton
ab8882e50c Add an ffmpeg version check to bbb-conf --check 2013-07-23 15:47:54 -04:00
Calvin Walton
a5091ba3e8 RaP: Remove the ffmpeg version check, hardcode arguments for 0.11+
For BigBlueButton 0.81, we just require that you install ffmpeg 0.11.x
for recordings to function correctly. I'll also add a check to bbb-conf
to verify that the correct ffmpeg is available.
2013-07-23 15:46:47 -04:00
Markos Calderon
da8ab0e4d5 Merge pull request #215 from bigbluebutton/deskshare-fullscreen-config
Added autoFullScreen in config xml
2013-07-22 18:00:47 -07:00
Markos Calderon
65bc8774f3 Added autoFullScreen in config xml 2013-07-22 19:58:35 -05:00
Fred Dixon
c79d7b951d Merge pull request #212 from SenecaCDOT-BigBlueButton/remove-video-chat-link
removed the private chat button from the webcam control buttons when the...
2013-07-19 09:23:43 -07:00
Fred Dixon
ecb6cbc718 Merge pull request #214 from tylercopeland/fix-demo-width
Fix demo width
2013-07-19 09:22:55 -07:00
Tyler Copeland
57b85b9c58 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-07-19 11:48:19 -04:00
Tyler Copeland
c40ae796d8 Updates to demo landing page 2013-07-19 11:47:32 -04:00
Jesus Federico
53dcbc82f8 bbb-lti: Restored xml extension to endPoint 2013-07-19 11:44:45 -04:00
Jesus Federico
553875287a bbb-lti: Restored bbb-lti.log file 2013-07-19 09:51:16 -04:00
bbb-test
c565c45b51 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2013-07-18 13:49:24 -07:00
Jesus Federico
dffdfa11ea bbb-lti: Simplified the url generation for the LTI xml cartridge 2013-07-18 16:48:48 -04:00
Gustavo Salazar
422e7570a0 Merge pull request #213 from kepstin/opaque-recording-slides
RaP: Adjust the 'convert' command to make opaque images
2013-07-18 13:21:15 -07:00
Jesus Federico
e51f30123a bbb-lti: Changed endpoint configuration to make it independent of the protocol 2013-07-18 15:27:21 -04:00
Jesus Federico
5e474dd3a9 bbb-lti: Added lti cartridge as response for GET request to tool.xml 2013-07-18 15:16:21 -04:00
Calvin Walton
ecfe8b7db4 RaP: Adjust the 'convert' command to make opaque images
This forces a background colour of white on the generated png images for
slides in the slides and presentation recording formats. Fixes Issue
1588.
2013-07-17 18:08:51 -04:00
Chad Pilkey
c657ab88c3 removed the private chat button from the webcam control buttons when the chat module is absent from the config.xml 2013-07-17 14:54:40 -07:00
Chad Pilkey
63f51c2c25 Merge pull request #211 from SenecaCDOT-BigBlueButton/add-window-links
Add window links
2013-07-17 13:36:11 -07:00
Chad Pilkey
d88af818f5 added 4 link buttons to the start of the tab order when a screen reader is active 2013-07-17 13:27:23 -07:00
Chad Pilkey
b91b634511 fixed the height of mic and webcam toolbar buttons and removed the tab order looping for now 2013-07-17 12:07:08 -07:00
Chad Pilkey
344dce81b3 fixed some issues with the text display in mic settings popup and added a couple of localizations 2013-07-17 12:06:23 -07:00
Fred Dixon
54d7bfeab0 Fixed date on my VM, commits now have proper timestamp. Updated index.html to read 0.81-beta-2 2013-07-16 19:32:59 -07:00
Chad Pilkey
4efc425f9a Merge remote branch 'upstream/master' into add-window-links 2013-07-16 06:24:13 -07:00
Chad Pilkey
a2ebd5a92c removed part of the blinking tag again 2013-07-16 06:24:03 -07:00
Gustavo Salazar
bed598ca7a remove events and files for webcam streams with length zero 2013-07-15 15:22:39 -05:00
Gustavo Salazar
873961509b Recommended browsers in playback 2013-07-15 15:16:34 -05:00
Richard Alam
67b59ee9d4 Merge pull request #203 from SenecaCDOT-BigBlueButton/chat-access-notification
Chat access notification
2013-07-15 10:57:40 -07:00
jtrobinson
49752b56a2 Resolved conflicts 2013-07-15 09:16:50 -07:00
Richard Alam
3f2bec293f Merge pull request #201 from SenecaCDOT-BigBlueButton/create-tab-loop
Create tab loop
2013-07-15 08:33:36 -07:00
jtrobinson
710530f59f Repairing some errors that came up in conflict resolution. 2013-07-15 07:25:52 -07:00
jtrobinson
4397154648 Resolved conflicts. 2013-07-15 07:21:39 -07:00
jtrobinson
165f18fa4f Notifications in chatTabs are not working. This bears returning to later. 2013-07-11 08:05:54 -07:00
jtrobinson
3128350bfb Merged upstream/master, resolved conflicts. 2013-07-10 09:48:03 -07:00
jtrobinson
40f5528d10 Still experimenting with ChatTabs accessibility. 2013-07-10 07:20:55 -07:00
Richard Alam
bf6c00f68d Merge pull request #200 from SenecaCDOT-BigBlueButton/fix-the-whiteboardtoolbar
place the whiteboard toolbar on the top when the presentation window is ...
2013-07-09 14:39:17 -07:00
Chad Pilkey
7137eaf189 place the whiteboard toolbar on the top when the presentation window is clicked 2013-07-09 14:36:02 -07:00
Richard Alam
56c6e32ed7 Merge pull request #199 from SenecaCDOT-BigBlueButton/add-keeptoolbarvisible-property
Add keeptoolbarvisible property
2013-07-09 10:33:46 -07:00
Chad Pilkey
532b9f50c9 cleaned up a missing return type 2013-07-09 10:11:10 -07:00
Chad Pilkey
ce3993a6af added a property keepToolbarVisible to the Whiteboard Module 2013-07-09 09:59:37 -07:00
Richard Alam
8269de8c44 Merge pull request #198 from SenecaCDOT-BigBlueButton/modify-page-title
Modify page title
2013-07-08 10:17:28 -07:00
Chad Pilkey
06a279ba2f added meeting title to the client html document title 2013-07-08 09:46:23 -07:00
Chad Pilkey
0e69428914 fixed a race condition with the shortcut options 2013-07-08 09:44:31 -07:00
Chad Pilkey
95868fc98d reworked the meeting name in the toolbar 2013-07-05 11:53:02 -07:00
Chad Pilkey
7bafd045e1 chat notification blinker is removed 2013-07-04 15:21:25 -07:00
Markos Calderon
5ed910cde5 Updating localization files 2013-07-04 12:18:57 -05:00
Richard Alam
ec87a3393b Merge pull request #195 from SenecaCDOT-BigBlueButton/fix-audio-security-dialog
Fix audio security dialog
2013-07-03 18:21:02 -07:00
Chad Pilkey
a10aaf5582 cleaning up log messages 2013-07-03 16:07:52 -07:00
Chad Pilkey
eb74f1fd54 cleaned up the way mic permissions work to handle Flash being in protected mode 2013-07-03 16:07:33 -07:00
Gustavo Salazar
9b5e42223f Accept meeting id to create manifest.xml 2013-07-03 15:42:21 -05:00
jtrobinson
dd06dd16e7 Chat tabs now modify their accessibility description to tell a screen reader whether there are new messages in that tab or not. Removed logic pertaining to ChatAccessibilityEvent, which was introduced as part of this branch and is no longer needed. 2013-07-02 09:08:15 -07:00