BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,440 Commits 13 Branches 260 Tags 1.1 GiB
34616c04d8
Commit Graph

5440 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markos Calderon
34616c04d8 Merge branch 'layout-module' of https://github.com/mconf/bigbluebutton into mconf-layout-module 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMap.mxml
 2013-03-08 17:04:02 -05:00
Markos Calderon
3d87c1cb1a change flag value for cameradeniedaccess 2013-03-07 16:02:08 -05:00
Markos Calderon
17a76f281b ask again for accessing to the webcam 2013-03-07 15:48:13 -05:00
Markos Calderon
058c9fda8f Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-03-07 15:20:55 -05:00
Markos Calderon
d6a368f32e change shortcutkeys property name in config.xml 2013-03-07 15:20:27 -05:00
Richard Alam
a9b3f7755b - in participants module, make sure the user is ejected from the voice conf when 
ejected from the web
 2013-03-07 16:23:02 +00:00
Richard Alam
40ae05b8d0 - in listeners's module, listen for eject user event and make sure that the user is 
also ejected from the voice conf
 2013-03-07 16:21:44 +00:00
Richard Alam
556131dce5 - eject all users from voice conference when meeting ends 2013-03-07 15:19:16 +00:00
Richard Alam
fd21773ba1 Merge pull request #101 from SenecaCDOT-BigBlueButton/fix-sharewebcam-toolbarbutton 
fixed bug 1393 and properly formatted the MIC_SETTINGS_CLOSED event thro...
 2013-03-05 11:56:16 -08:00
Richard Alam
dd267e21db Merge pull request #100 from SenecaCDOT-BigBlueButton/add-participants-to-layout 
the presentation window has been added to the layout.xml file and is pro...
 2013-03-05 11:55:35 -08:00
Richard Alam
084ae6ac44 Merge pull request #99 from SenecaCDOT-BigBlueButton/implement-mute-all 
implemented mute all functionality
 2013-03-05 11:55:08 -08:00
Fred Dixon
812d15e988 Merge pull request #94 from kishba/master 
Verified changes that work with Blackboard's LTI support.  Thanks!
 2013-03-05 11:45:03 -08:00
Markos Calderon
b2dd27d56f added showbutton to deskshare module 2013-03-05 10:01:42 -05:00
Brandon Kish
91370bb695 Adding recording support to the LTI middleware Grails app 
When configuring an LTI consumer, pass [custom_]record=true to indicate
whether the session should be recorded.
 2013-03-05 08:36:58 -05:00
Chad Pilkey
034a7b4b61 fixed bug 1393 and properly formatted the MIC_SETTINGS_CLOSED event throughout the client 2013-03-04 18:43:45 -05:00
Chad Pilkey
cc563a73b5 the presentation window has been added to the layout.xml file and is properly positioned 2013-03-04 17:29:36 -05:00
Chad Pilkey
e655b2dfa3 implemented mute all functionality 2013-03-04 17:21:37 -05:00
Markos Calderon
4a67a67826 fix deskshare preview when the area is wider 2013-03-04 15:53:54 -05:00
Fred Dixon
f58fa128dd Removed carriage returns from config.xml so the bbb-client post instal scripts would run without error 2013-03-03 03:45:32 -05:00
Chad Pilkey
c883340d9c removed Shortcut button from the layout when invisible and fixed a typo in a method name. ('T's are important) 2013-03-01 20:17:14 -05:00
Chad Pilkey
638b3d01a4 Merge remote branch 'upstream/master' into access-hotfix 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
 2013-03-01 20:12:07 -05:00
Chad Pilkey
f79de237de fixed a lot of issues with accessibility 2013-03-01 20:00:33 -05:00
Richard Alam
b57044dcc7 Merge pull request #85 from SenecaCDOT-BigBlueButton/fix-controlbutton-null-ref 
fix null ref when presenter switches before video control buttons load fully
 2013-03-01 10:26:53 -08:00
Richard Alam
3740380e58 Merge pull request #93 from SenecaCDOT-BigBlueButton/fix-presentation-zoom 
Fix presentation zoom
 2013-03-01 10:05:03 -08:00
Markos Calderon
942d2f146a make shortcutKeys button configurable in config.xml 2013-02-28 17:32:44 -05:00
Markos Calderon
0fba95a2ac Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-02-28 15:52:03 -05:00
Markos Calderon
a56d706b3d fix share webcam when autosharing is true and show button false 2013-02-28 15:51:35 -05:00
Richard Alam
36130c1339 Merge branch 'master' into unify-users-and-listeners 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
 2013-02-28 19:26:01 +00:00
Hugo Lazzari
a98b604dc5 Fixed missed import and misspelled variable. 2013-02-28 09:18:10 -03:00
Brandon Kish
b1c75c2352 Allow LTI to pass custom welcome messages 2013-02-27 15:34:12 -05:00
Hugo Lazzari
cd35eb4b03 Refactoring code to fix problem where combobox lost event to populate its data. 2013-02-27 14:39:41 -03:00
Markos Calderon
798007de5a Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-02-26 19:10:30 -05:00
Markos Calderon
429d1e9a31 presenters preview desktopsharing centered 2013-02-26 19:10:05 -05:00
Hugo Lazzari
30e46569c2 Fixed problem where layout list wasn't displayed 
The problem occured because the event to populate the list was sent
before the creation of combobox.
 2013-02-26 15:42:35 -03:00
Richard Alam
85177576b3 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-02-26 14:09:34 +00:00
Richard Alam
5f0b2a7ea7 - change logging history from 30 days to 5 days...don't need that much history 2013-02-26 14:08:12 +00:00
Brandon Kish
83ac77455f Update bbb-lti README to note trailing slash issue 
Save yourself hours of LTI debugging! Copying/pasting the URL bbb-conf
--salt brings along a trailing slash, which bbb-lti does NOT
appreciate. :)
 2013-02-25 19:14:35 -05:00
Brandon Kish
2db46f839e Expand role detection to support Blackboard's LTI implementation 
I found that Blackboard prefers to send the Instructor role within the
"urn:lti:role:ims/lis/" URN. The support was already here, I just
extended the detected roles. Hooray for Blackboard support in
BigBlueButton!
 2013-02-25 19:12:03 -05:00
Markos Calderon
fe7ff40fce Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-02-25 18:36:26 -05:00
Richard Alam
9f14b3c380 Merge branch 'master' of github.com:blindsidenetworks/bigbluebutton 2013-02-25 21:27:45 +00:00
Markos Calderon
47b193ceab change color picker for whiteboard 2013-02-25 15:24:25 -05:00
Richard Alam
8189c61909 - add example on how to get dial number and voice bridge from JS API 2013-02-25 15:14:52 +00:00
Markos Calderon
3003280227 Added voicebridge and dialnumber to ExternalApiCalls 2013-02-22 15:37:59 -05:00
Markos Calderon
5e3a03eaa5 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-02-20 17:48:45 -05:00
Markos Calderon
6ba6395a47 added font chat size 2013-02-20 17:48:17 -05:00
Richard Alam
e43bebe691 - make sure participants module dispatches events the same as listener's module 2013-02-20 21:42:28 +00:00
Richard Alam
9bfdd8cf0b - use viewers and listeners window for now...we will decide to use the participants module in this release or next 2013-02-20 21:41:10 +00:00
Richard Alam
5469e4eb01 - remove compile warning 2013-02-20 20:51:28 +00:00
Richard Alam
79ed1bdbe9 Merge branch 'master' into unify-users-and-listeners 2013-02-20 19:46:11 +00:00
Richard Alam
dfcf933ad5 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-02-20 17:47:36 +00:00