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

5558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gustavo salazar
338ed2bc6c store error messages in the script log file. Fix #1281 2013-04-02 18:53:08 -05:00
gustavo salazar
93ed54795e process last 'pan and zoom' event. Fix #1451 2013-04-02 17:35:57 -05:00
Markos Calderon
1d18ddf4be Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-04-02 16:23:47 -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
2cd46b6f34 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-04-01 19:32:35 -05:00
gustavo salazar
25ef021b7c Fix errors in playback with IE, fix #1342 2013-04-01 18:40:01 -05:00
Markos Calderon
dbe12bd4e7 fixed goToPage issue not updating for others 2013-04-01 16:15:27 -05:00
Fred Dixon
be24c16ca1 Updated bbb-conf to detect OpenOffice or LibreOffice 2013-03-29 22:00:46 -04:00
Richard Alam
e35071a050 - add API to allow querying for default config.xml 2013-03-27 18:21:54 +00:00
Richard Alam
27af71f208 - handle passing of config xml 2013-03-27 16:06:03 +00:00
Richard Alam
e458a15237 - cleanup fs config 2013-03-27 15:27:19 +00: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
799cc3f348 Merge pull request #114 from SenecaCDOT-BigBlueButton/swap-playback-pres-video 
Swap playback pres video
 2013-03-24 12:34:59 -07:00
Chad Pilkey
7fdbcb5152 cleaned up playback.js 2013-03-24 12:30:05 -07:00
Chad Pilkey
ccecba6374 Added button to the control bar that swaps the video and presentation area in the playback 2013-03-24 12:26:53 -07:00
Richard Alam
d9dc599b24 - add a black theme file 2013-03-23 20:48:55 +00:00
Richard Alam
dc0cf7034b Merge pull request #113 from SenecaCDOT-BigBlueButton/fix-video-dock 
added video option to prioritize a user's webcam when they start talking
 2013-03-23 10:55:48 -07: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
d9bbc14d80 - remove decoding of config xml to utf-8...I still think we need to encode 
the config xml to utf-8 and decode it
 2013-03-22 15:32:44 +00:00
Richard Alam
6de26a98a8 Merge branch 'master' into merge-master-into-dynamic-config 2013-03-22 14:57:53 +00:00
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
8c157a3914 - handle setConfigXML 2013-03-21 17:14:13 +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
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
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
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
5549373a17 Merge branch 'upgrade-to-red5-r4597' into merge-master-into-dynamic-config 2013-03-18 18:08:29 +00:00
Richard Alam
db8d305d3b Merge branch 'master' into merge-master-into-dynamic-config 2013-03-18 18:06:36 +00: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