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

5501 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chad Pilkey
df557b89af changed all internal references to participants to users 2013-03-15 18:53:39 -04:00
Chad Pilkey
c77ceba8fe renamed participants files to users files 2013-03-15 18:08:53 -04:00
Chad Pilkey
8671477202 renamed participants module to users 2013-03-15 17:54:32 -04:00
Richard Alam
52bd6f2b7d - make JS API voice mute/unmute, etc. work with the participants module 2013-03-15 18:49:45 +00:00
Jesus Federico
1e307769c1 Merge pull request #107 from kishba/fix-lti-custom-welcome-message 
Fixes LTI custom welcome message for bbb-lti 0.1.1
 2013-03-14 13:19:03 -07:00
Richard Alam
956242d644 - use Participants module as default 2013-03-14 18:47:01 +00:00
Richard Alam
f22a4368de Merge pull request #106 from jfederico/master 
Added a footer to welcome message.
 2013-03-14 10:19:57 -07:00
Brandon Kish
8908657b68 Rename custom_record to custom_bbb_record and override welcome message when appropriate 
I'm re-applying this code after reviewing the 0.1.1 version of bbb-lti. From my testing, an LTI's custom welcome message is currently being ignored.
 2013-03-14 12:42:53 -04:00
Richard Alam
a6736d8e68 - change bw and port test to connect to a subscope. Somehow if we don't, we can't reconnect again when all users logs out 2013-03-14 15:54:14 +00:00
Richard Alam
8731a43148 Merge branch 'bbb-red5-r4592' 2013-03-13 19:19:30 +00:00
jfederico
f56c4474e6 bigbluebutton-web: Added a footer to welcome message. A disclaimer or copyright signature can be placed here for all the meetings in a server. 2013-03-13 15:01:14 -04:00
Fred Dixon
091ba72f0c Merge pull request #105 from jfederico/master 
bbb-lti_v0.1.1.
 2013-03-13 08:50:58 -07:00
jfederico
2b23d9cea7 Merge branch 'bbb-lti_v0.1.1' 2013-03-13 11:30:46 -04:00
jfederico
ebe26d81b3 bbb-lti_v0.1.1: Extended roles to support Blackboard LTI implementation 
As contributed by Brandon Kish
 2013-03-13 10:24:38 -04:00
Richard Alam
b6d85ad035 Merge pull request #104 from SenecaCDOT-BigBlueButton/more-client-fixes 
More client fixes
 2013-03-13 07:09:47 -07:00
Chad Pilkey
af7e8c5bc4 Merge remote branch 'upstream/master' into more-client-fixes 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/ParticipantsWindow.mxml
 2013-03-12 18:17:01 -04:00
Chad Pilkey
2bc57e953a added mute all except presenter and removed presenter from sort function 2013-03-12 17:57:40 -04:00
Markos Calderon
d3c303776e added localization strings for participants module 2013-03-12 16:02:35 -05:00
Markos Calderon
0d01fb9a4b Check if accessibility is supported 2013-03-11 15:02:59 -05:00
Chad Pilkey
1c7a06003b removed chat colour picker and coloured the welcome message 2013-03-11 13:17:23 -04:00
Chad Pilkey
d581bf6958 moved the Select File button 2013-03-11 11:58:44 -04:00
Richard Alam
897cc08c67 Merge branch 'master' into bbb-red5-r4592 2013-03-11 15:02:30 +00:00
Richard Alam
02296cf267 - upgrade to red5 r4592 2013-03-11 15:00:48 +00:00
Richard Alam
ece4ef7f1f - BBB now starts properly on red5 r4582. Need a bit more testing though. 2013-03-08 22:49:11 +00:00
Richard Alam
412f44690b - try making sure that the different components execute the lifecycle properly 2013-03-08 22:21:31 +00:00
Markos Calderon
86970340d8 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-03-08 17:05:01 -05:00
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
Richard Alam
7c4326a22e - make bbb start on red5 r4582 2013-03-08 20:39:37 +00:00
Richard Alam
3868f5958f Merge branch 'master' into upgrade-to-red5-r4580 2013-03-08 15:48:55 +00:00
Richard Alam
74e983605d Merge pull request #102 from SenecaCDOT-BigBlueButton/css-improvements 
cleaned up the UI a little
 2013-03-08 07:00:22 -08:00
Chad Pilkey
f1b9e19a42 cleaned up the UI a little 2013-03-07 18:04:32 -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
e6da7afcdd - upgrade to red5 r4582 2013-03-07 19:48:03 +00:00
Richard Alam
63a3420b76 Merge branch 'master' into upgrade-to-red5-r4580 2013-03-07 18:42:25 +00: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
310c283dd1 - initialize shared objects not on roomstart but on room connect 2013-03-06 15:59:40 +00:00
Richard Alam
3c53ceecec - upgrade to red5 r4581 2013-03-06 15:58:56 +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