BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,567 Commits 13 Branches 260 Tags 1.1 GiB
163ad1ea54
Commit Graph

3567 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
20330a1252 Merge remote branch 'guga/refactor' into guga-pull 2011-07-15 09:53:35 -04:00
Richard Alam
4d5b2056b1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-07-15 09:49:47 -04:00
Richard Alam
f51300c5d9 - try out custom broadcaster 2011-07-15 09:49:11 -04:00
gugat
c56facd64c Change image presentations (gif, jpg) to png, so they will be played properly 2011-07-14 18:51:51 -05:00
gugat
51d0ba5bf7 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into respaldo 2011-07-14 18:46:42 -05:00
Richard Alam
192b54d978 - fix wrong attributes in config.xml tempalte 2011-07-14 14:56:09 -04:00
Richard Alam
6ec4c04ce7 - change config.xml template to have the new options 2011-07-14 14:07:38 -04:00
Richard Alam
adff755e80 - rename vars 2011-07-14 14:07:22 -04:00
Richard Alam
251176461f Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-07-14 14:00:58 -04:00
Richard Alam
cb2e89a127 - make modules/ui more configurable...however, need to do more work to make it more flexible. 2011-07-14 13:59:51 -04:00
Fred Dixon
74693999b7 Changed links on index.html to point to /demo/demo1.jsp instead of /bigbluebutton/demo/demo1.jsp 2011-07-14 10:10:44 -07:00
gugat
89086ba54a Merge branch 'refactor' of github.com:gugat/bigbluebutton into respaldo 2011-07-14 10:30:06 -05:00
gugat
1010dc4cbf Add support for presentation images (jpg,png,gif) in simple processing 2011-07-14 09:49:26 -05:00
gugat
feeaf1bcb6 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into respaldo 2011-07-14 09:44:12 -05:00
Richard Alam
a328301ede - add some new classes to store module options 2011-07-13 18:17:27 -04:00
Richard Alam
4d9b03647c - cleanup 2011-07-13 18:16:58 -04:00
Richard Alam
cd479689a6 - cleanup 
- add parameter to hide viewer and listeners windows. Need to make thsi more flexible later on.
 2011-07-13 18:15:39 -04:00
Richard Alam
d250710b28 - use e4x to manage config 
- make enabling private chat configurable. SO now, in the chat module, you can change "privateEnabled=true" to "privateEnabled=false".
 2011-07-13 16:41:05 -04:00
Localization Server
f74febcd35 Updating locale 2011-07-13 10:20:02 +00:00
Localization Server
f59b9115d2 Updating locale 2011-07-13 09:20:02 +00:00
gugat
21eed7e1d4 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into respaldo 2011-07-11 14:26:47 -05:00
Richard Alam
d44fd0cbdd Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-07-10 16:13:02 -04:00
Richard Alam
8a013304b6 - fix problem where %%CONFNAME%% doesn't get substituted 2011-07-10 16:11:14 -04:00
Fred Dixon
76947a3cd6 use meetingID for index.html file for slides playback (this index.html file is for testing only and will soon disappear) 2011-07-10 11:33:22 -07:00
Fred Dixon
6f6cc70c6b Change set redisHost to 127.0.0.1 to match other config files 2011-07-10 10:23:01 -07:00
Fred Dixon
247f845e98 Added support for bbb-conf to update host in simple.yml (record and playback) 2011-07-10 08:54:43 -07:00
Fred Dixon
74dcf87466 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-07-10 08:38:19 -07:00
Fred Dixon
c431169bd7 Changed redis host for bigbluebutton.yml to 127.0.0.1 2011-07-10 08:38:12 -07:00
Richard Alam
8070f25bab - change permission of file so that it is readable by nginx 2011-07-10 10:32:20 -04:00
Richard Alam
41269197ca - check it meeting is already being recorded 2011-07-10 10:31:49 -04:00
Richard Alam
2b9a53e76c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-07-10 10:01:30 -04:00
Localization Server
c7e64aac58 Updating locale 2011-07-10 09:20:03 +00:00
Localization Server
de0e590794 Updating locale 2011-07-09 15:00:01 +00:00
Localization Server
abc1bcc905 Updating locale 2011-07-09 13:20:02 +00:00
Localization Server
d425eec67d Updating locale 2011-07-09 12:00:03 +00:00
Richard Alam
47db479e6d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-07-08 17:05:21 -04:00
Richard Alam
9c3389e68f - fix problem for getting viewer password 2011-07-08 17:04:51 -04:00
Richard Alam
3481096c07 - fix compiler warnings for Flex 4.5 deprecated methods 2011-07-06 14:53:21 +00:00
Localization Server
313a21813b Updating locale 2011-07-06 14:20:02 +00:00
Richard Alam
d075e571fa - uncomment skinning to be able to skin bbb client 2011-07-06 14:08:49 +00:00
Richard Alam
84506d7931 - disable publish button when publishing has started...this fixes the problem where 
a user can publish the webcam more than once
 2011-07-06 14:07:45 +00:00
Richard Alam
ca7663044a - fix deskstop sharing...it chokes on this line 
setCurrentState("dispQuitControlBar");
   I'm not sure why. To fix, just combined the "Close" button
   with the "Fullscreen" and "Region" button.
 2011-07-05 16:07:42 +00:00
Localization Server
3b4f871023 Updating locale 2011-07-05 16:00:03 +00:00
Richard Alam
9ccd216042 - propagate webcam fixes from master 2011-07-05 14:13:46 +00:00
gugat
b13cd69038 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into respaldo 2011-07-04 20:02:09 -05:00
gugat
12bdbf8475 Add logi to check redis port an host 2011-07-04 20:01:41 -05:00
Fred Dixon
12fdbfb7f0 removed bbb_api_conf.jsp as it will be auto generated from install scripts 2011-07-04 10:45:07 -07:00
gugat
734e21dea9 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into respaldo 2011-07-04 09:39:11 -05:00
Fred Dixon
898fa1a930 Add configuration for nginx for breaking out API demos into their own package 2011-07-03 12:17:58 -07:00
gugat
428dbe84f2 Create script with logic we need to add for record and playback 
Based in bbb-conf create functions to check errors in record and playback log files
 2011-06-30 21:17:01 -05:00