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

2663 Commits

Author SHA1 Message Date
Markos Calderon
e34ddfe757 disable kick yourself 2013-04-03 14:38:06 -05:00
Markos Calderon
d7308bb0ab added hebrew language 2013-04-02 16:23:24 -05:00
Markos Calderon
1261828a09 added maxFileSize configurable from config.xml 2013-04-02 14:56:11 -05:00
Markos Calderon
dbe12bd4e7 fixed goToPage issue not updating for others 2013-04-01 16:15:27 -05:00
Richard Alam
2ac532cf2e Merge branch 'master' into merge-master-into-dynamic-config 2013-03-27 14:21:05 +00:00
Richard Alam
c5f668e3bc - fix bug where publish window becomes resizable when broadcasting webcam 2013-03-25 17:11:22 +00:00
Richard Alam
d9dc599b24 - add a black theme file 2013-03-23 20:48:55 +00:00
Chad Pilkey
d46d416aad Merge remote branch 'upstream/master' into fix-video-dock 2013-03-23 13:55:23 -04:00
Chad Pilkey
3dd69116d9 added video option to prioritize a user's webcam when they start talking 2013-03-23 13:49:30 -04:00
Richard Alam
0fff63d4d2 - display multiple resolutions for all users 2013-03-22 16:10:59 +00:00
Richard Alam
6de26a98a8 Merge branch 'master' into merge-master-into-dynamic-config 2013-03-22 14:57:53 +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
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
685da4de75 Merge branch 'master' into merge-master-into-dynamic-config 2013-03-20 14:49:08 +00:00
Richard Alam
65c28bf90a - minor cleanup 2013-03-19 22:28:28 +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
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
6955757a3e Merge branch 'master' into merge-master-into-dynamic-config 2013-03-18 18:35:43 +00: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
db8d305d3b Merge branch 'master' into merge-master-into-dynamic-config 2013-03-18 18:06:36 +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
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
0e386adab2 Merge branch 'master' into merge-master-into-dynamic-config 2013-03-15 21:03:13 +00:00
Richard Alam
52bd6f2b7d - make JS API voice mute/unmute, etc. work with the participants module 2013-03-15 18:49:45 +00:00
Richard Alam
956242d644 - use Participants module as default 2013-03-14 18:47:01 +00: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
jfederico
2b23d9cea7 Merge branch 'bbb-lti_v0.1.1' 2013-03-13 11:30:46 -04: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
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
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
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
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