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

5522 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
5d3bb5fb70 - remove extra parameters when connecting to bbb-apps 2013-03-22 14:48:20 +00:00
Richard Alam
a5c193bc7a Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-03-22 14:17:59 +00:00
Richard Alam
aebc524125 - Fix NPE when removing voice conference when all users have left 2013-03-22 14:16:31 +00:00
Markos Calderon
787b437479 fix setting h264 level 2013-03-21 16:50:30 -05:00
Richard Alam
2074ef0d5e - need to clean up scopes properly and try to minimize dependency on scope lifecycle 2013-03-21 20:00:58 +00:00
Richard Alam
2c3c45f866 Merge pull request #111 from SenecaCDOT-BigBlueButton/fix-kick-user-button 
fixed the mutebtn in the users itemrenderer to be included in the layout
 2013-03-20 10:47:50 -07:00
Chad Pilkey
f2cc1028ef fixed the mutebtn in the users itemrenderer to be included in the layout 2013-03-20 13:10:44 -04:00
Richard Alam
65c28bf90a - minor cleanup 2013-03-19 22:28:28 +00:00
Richard Alam
04b4b14b98 Merge branch 'master' into upgrade-to-red5-r4597 2013-03-19 19:21:55 +00:00
Richard Alam
60b3586024 Merge pull request #110 from SenecaCDOT-BigBlueButton/fix-camera-settings-popup 
fixed camera settings resolution and a tooltip
 2013-03-19 12:21:14 -07:00
Richard Alam
df806429a0 Merge pull request #109 from SenecaCDOT-BigBlueButton/imp-users-module 
added images when buttons are disabled in the users window and button im...
 2013-03-19 12:20:48 -07:00
Richard Alam
c6ac009b86 Merge branch 'master' into upgrade-to-red5-r4597 2013-03-19 18:28:38 +00:00
Richard Alam
0cb6721147 - upgrade to red5 r4599 2013-03-19 18:27:22 +00:00
Chad Pilkey
795df0761b fixed camera settings resolution and a tooltip 2013-03-19 13:08:27 -04:00
Chad Pilkey
8f164d3e23 added images when buttons are disabled in the users window and button images swap on mouse over 2013-03-18 19:08:30 -04:00
Richard Alam
b4a1cd191b Merge pull request #108 from SenecaCDOT-BigBlueButton/rename-participants-module 
Rename participants module
 2013-03-18 11:33:18 -07:00
Richard Alam
d28a7ecf02 - upgrade to red5 r4597 2013-03-18 18:05:35 +00:00
Markos Calderon
f0bbe5db4e Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-03-18 12:58:36 -05:00
Markos Calderon
9babc757fc fix close cam if it's not available 2013-03-18 12:58:09 -05:00
Fred Dixon
f59e34ed58 Updates to bbb_api.jsp to pass along redirectClient=true for joinURL to load demo11.html 2013-03-17 21:02:36 -04:00
Fred Dixon
ca78934f21 First pass at adding demo11.jsp and demo11.html which gives examples of using the new BigBlueButton JavaScript API 2013-03-17 20:38:49 -04:00
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