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

6454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Markos Calderon
5697f7c30a some small fixes in the polling workflow 2013-07-18 18:24:50 -05: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
Chad Pilkey
0bf957482d switched the word close in the audio and video popups with cancel 2013-07-18 09:07:19 -07:00
Markos Calderon
1df0a4c4ba fix for precreated poll 2013-07-17 18:46:32 -05: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
Markos Calderon
d246af64cb fix for presenter icon 2013-07-17 15:57:17 -05: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
Richard Alam
dc181437ae - implement stop poll 2013-07-11 21:39:26 +00:00
Richard Alam
ef7c97d848 - publish poll events 2013-07-11 20:56:03 +00:00
Richard Alam
34a9875766 - enable webhooks 2013-07-11 19:20:11 +00:00
jtrobinson
165f18fa4f Notifications in chatTabs are not working. This bears returning to later. 2013-07-11 08:05:54 -07:00
Richard Alam
30ac4dba25 - minor cleanup 2013-07-10 22:00:28 +00:00
Richard Alam
424a9127c6 - modify so that generated JSON will have "responseIDs" 2013-07-10 21:59:46 +00:00
Richard Alam
14d3b615bc - handle prescreated polls and display them in client 2013-07-10 20:56:32 +00:00
Richard Alam
7d3e5afb5f - remove re-encoding of posted XML data as grails 1.3.9 doesn't unencode automatically the data 2013-07-10 19:14:25 +00: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
c6611f6f4e - have bbb-web send create/destroy meeting to red5 2013-07-09 20:52:57 +00: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
Richard Alam
23dc0b0f54 - store if poll has started and stopped 2013-07-09 17:26:56 +00: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
1d60fe0825 - display result for user that has responded to the poll 2013-07-09 15:06:46 +00:00
Richard Alam
b90f599b33 - hook up events in take poll window 2013-07-09 14:59:09 +00:00