Commit Graph

5634 Commits

Author SHA1 Message Date
Jesus Federico
bc8c116077 Updated config.xml and removed hardcoded IP address 2013-04-05 12:07:00 -04:00
Jesus Federico
36ed2f6537 Made error messages consistent on setConfigXML 2013-04-05 00:07:41 -04:00
Jesus Federico
549600aab2 Adjusted bbb-api.jsp to support POST with different contentTypes 2013-04-05 00:06:50 -04:00
Markos Calderon
652076d952 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-04-04 15:50:26 -05:00
Markos Calderon
0db6cfedb6 make gloweffect configurable 2013-04-04 15:50:12 -05:00
Gustavo Salazar
7fe05d349f sanity check for webcam and deskshare 2013-04-04 15:08:49 -05:00
Richard Alam
3f27928cd6 Merge pull request #117 from SenecaCDOT-BigBlueButton/re-implement-locking
more misc fixes
2013-04-04 12:33:38 -07:00
Chad Pilkey
66e7f0bb98 more misc fixes 2013-04-04 12:04:05 -07:00
jfederico
079cfa25ee Fixed few errors on demo12.jsp 2013-04-04 11:43:26 -04:00
Gustavo Salazar
c30da2c641 dont use rearchive until feature is complete 2013-04-03 19:48:32 -05:00
Gustavo Salazar
5611a385de Re-archive recording. Fix #1448 2013-04-03 19:13:02 -05:00
Gustavo Salazar
19d152ac80 enable or disable a recording workflow. Fix #1455 2013-04-03 18:01:38 -05:00
jfederico
f55abba128 Extended bbb-api.jsp to support dynamic configXML example 2013-04-03 18:32:23 -04:00
Markos Calderon
8092532740 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-04-03 17:29:17 -05:00
Markos Calderon
5898b5ad49 correction for autokick 2013-04-03 17:28:54 -05:00
Richard Alam
5d11113fb9 - enable echo suppression to minimize echo when checking for mic settings 2013-04-03 21:49:41 +00:00
jfederico
8075760fae Added demo12.jsp for Dynamic ConfigXML demonstration 2013-04-03 17:41:02 -04:00
Richard Alam
01589f605f Merge pull request #116 from SenecaCDOT-BigBlueButton/re-implement-locking
you no longer appear to be connected to the audio no matter what
2013-04-03 14:15:50 -07:00
Chad Pilkey
f1046c7df8 you no longer appear to be connected to the audio no matter what 2013-04-03 14:11:45 -07:00
Richard Alam
0b8088c1a9 Merge pull request #115 from SenecaCDOT-BigBlueButton/re-implement-locking
Re implement locking
2013-04-03 13:23:53 -07:00
Chad Pilkey
883bc045ed Merge remote branch 'upstream/master' into re-implement-locking 2013-04-03 13:17:00 -07:00
Chad Pilkey
c91bbfd7db changed the individual mute and lock to images when not rolled over and buttons when rolled 2013-04-03 13:14:40 -07:00
Markos Calderon
e34ddfe757 disable kick yourself 2013-04-03 14:38:06 -05:00
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
Chad Pilkey
2b5f91d170 pushing before fire alarm 2013-04-02 13:15:08 -07:00
Markos Calderon
1261828a09 added maxFileSize configurable from config.xml 2013-04-02 14:56:11 -05:00
Chad Pilkey
00479ecd4b reverted to just locking enabled 2013-04-02 10:03:47 -07: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
Chad Pilkey
bfa8e97e34 mic disable state is implemented, but can't filter by role yet 2013-03-28 14:38:37 -07: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