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

5427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
0380083d24 Merge branch 'master' into upgrade-to-red5-r4573 2013-03-04 17:33:38 +00:00
Richard Alam
eadd1e3ef0 - upgrade builds to red5 r4578 2013-03-03 12:34:25 +00:00
Fred Dixon
f58fa128dd Removed carriage returns from config.xml so the bbb-client post instal scripts would run without error 2013-03-03 03:45:32 -05:00
Chad Pilkey
c883340d9c removed Shortcut button from the layout when invisible and fixed a typo in a method name. ('T's are important) 2013-03-01 20:17:14 -05:00
Chad Pilkey
638b3d01a4 Merge remote branch 'upstream/master' into access-hotfix 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
 2013-03-01 20:12:07 -05:00
Chad Pilkey
f79de237de fixed a lot of issues with accessibility 2013-03-01 20:00:33 -05:00
Richard Alam
b57044dcc7 Merge pull request #85 from SenecaCDOT-BigBlueButton/fix-controlbutton-null-ref 
fix null ref when presenter switches before video control buttons load fully
 2013-03-01 10:26:53 -08:00
Richard Alam
3740380e58 Merge pull request #93 from SenecaCDOT-BigBlueButton/fix-presentation-zoom 
Fix presentation zoom
 2013-03-01 10:05:03 -08:00
Markos Calderon
942d2f146a make shortcutKeys button configurable in config.xml 2013-02-28 17:32:44 -05:00
Markos Calderon
0fba95a2ac Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-02-28 15:52:03 -05:00
Markos Calderon
a56d706b3d fix share webcam when autosharing is true and show button false 2013-02-28 15:51:35 -05:00
Richard Alam
897f63a601 Merge branch 'master' into upgrade-to-red5-r4573 2013-02-28 19:30:28 +00:00
Richard Alam
36130c1339 Merge branch 'master' into unify-users-and-listeners 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
 2013-02-28 19:26:01 +00:00
Richard Alam
29864cc734 - create and executor to send messages 2013-02-28 19:08:38 +00:00
Richard Alam
99443dc3cb - removing clientID as we don't use the Red5 connect id anymore 2013-02-28 18:27:41 +00:00
Richard Alam
19d2472fd0 - move logback config into resources dir so we don't need to copy it as last step in gradle war 2013-02-28 01:03:31 +00:00
Richard Alam
c25bb9525b Merge branch 'master' into upgrade-to-red5-r4573 2013-02-28 00:47:20 +00:00
Richard Alam
46a07f4eb6 - build bbb-voice and bbb-video on red5 r4573 2013-02-28 00:33:53 +00:00
Richard Alam
e3cbd49bae - minor cleanup 2013-02-28 00:27:10 +00:00
Richard Alam
e689d1fec7 - build desktop sharing....need to put file-uploads jar into red5/lib 2013-02-28 00:26:32 +00:00
Richard Alam
bc3078ec4b - ignore auto-generated dir 2013-02-28 00:26:10 +00:00
Richard Alam
fd38f01961 - clean up 2013-02-28 00:25:04 +00:00
Richard Alam
ed64da0f9b - build bbb-apps on red5 r4573 2013-02-27 23:35:16 +00:00
Markos Calderon
798007de5a Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-02-26 19:10:30 -05:00
Markos Calderon
429d1e9a31 presenters preview desktopsharing centered 2013-02-26 19:10:05 -05:00
Richard Alam
cc859b94f8 Merge branch 'master' into upgrade-to-red5-r4573 2013-02-26 14:48:01 +00:00
Richard Alam
85177576b3 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-02-26 14:09:34 +00:00
Richard Alam
5f0b2a7ea7 - change logging history from 30 days to 5 days...don't need that much history 2013-02-26 14:08:12 +00:00
Markos Calderon
fe7ff40fce Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-02-25 18:36:26 -05:00
Richard Alam
9f14b3c380 Merge branch 'master' of github.com:blindsidenetworks/bigbluebutton 2013-02-25 21:27:45 +00:00
Richard Alam
4838840aa5 - upgrading red5 jar 2013-02-25 20:41:50 +00:00
Markos Calderon
47b193ceab change color picker for whiteboard 2013-02-25 15:24:25 -05:00
Richard Alam
8189c61909 - add example on how to get dial number and voice bridge from JS API 2013-02-25 15:14:52 +00:00
Markos Calderon
3003280227 Added voicebridge and dialnumber to ExternalApiCalls 2013-02-22 15:37:59 -05:00
Markos Calderon
5e3a03eaa5 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-02-20 17:48:45 -05:00
Markos Calderon
6ba6395a47 added font chat size 2013-02-20 17:48:17 -05:00
Richard Alam
e43bebe691 - make sure participants module dispatches events the same as listener's module 2013-02-20 21:42:28 +00:00
Richard Alam
9bfdd8cf0b - use viewers and listeners window for now...we will decide to use the participants module in this release or next 2013-02-20 21:41:10 +00:00
Richard Alam
5469e4eb01 - remove compile warning 2013-02-20 20:51:28 +00:00
Richard Alam
79ed1bdbe9 Merge branch 'master' into unify-users-and-listeners 2013-02-20 19:46:11 +00:00
Richard Alam
dfcf933ad5 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-02-20 17:47:36 +00:00
Richard Alam
f616a8e8ef Merge branch 'master' into add-user-custom-properties 2013-02-20 17:37:19 +00:00
Richard Alam
2f52da172c - example how to access user data from JS 2013-02-20 17:36:20 +00:00
Markos Calderon
d1532fb846 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-02-20 12:14:32 -05:00
Markos Calderon
980c273c56 setting minimum at 1 2013-02-20 12:14:16 -05:00
Richard Alam
2ccf330c08 - add layout for unified users and listeners 2013-02-20 16:11:04 +00:00
Markos Calderon
2b2109eeae fixing js problem 2013-02-20 10:53:32 -05:00
Richard Alam
f166a9489e - trying to figure out why listener and viewers module doesn't display anymore 2013-02-19 22:46:04 +00:00
Markos Calderon
2fc1e219b3 parsing customdata xml 2013-02-19 17:29:08 -05:00
Richard Alam
c24cf55d9c Merge branch 'master' into unify-users-and-listeners 
Conflicts:
	bigbluebutton-client/build.xml
 2013-02-19 21:31:56 +00:00