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

5335 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Richard Alam
7bcdd8cdbb - return dial number in get meeting info 2013-02-19 20:54:18 +00:00
Markos Calderon
cc1e40d61c Added user customdata to the client 2013-02-19 12:18:12 -05:00
Markos Calderon
1929526a4d added custom data parameter when a user joins to a meeting 2013-02-14 15:59:52 -05:00
Gustavo Salazar
256a9dc200 set text file only when it exists 2013-02-13 17:13:55 -05:00
Gustavo Salazar
406e467c8b set audio sample rate according to the recorded audio file 2013-02-13 14:42:23 -05:00
Richard Alam
37db82c67a - add JS API to query for presenter user id 2013-02-13 17:05:59 +00:00
Richard Alam
b5141883f1 - add sample on how to query the presenter user id 2013-02-13 17:05:05 +00:00
Richard Alam
bc055b9386 Merge branch 'master' into add-user-custom-properties 2013-02-13 02:32:56 +00:00
Richard Alam
36e191d3d2 - update BBB JS API 2013-02-14 21:26:08 +00:00
Richard Alam
c871bbd369 - update event name list 2013-02-14 19:58:51 +00:00
Richard Alam
c957be6f4d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-02-12 21:11:24 +00:00
Richard Alam
1c7c4c1dd8 - add JS callback for Webcam Stanalone apps to say that they are ready 2013-02-12 21:09:45 +00:00
Richard Alam
aae6ff77b7 - have the webcam standlaone apps call to the JS shell to inform external JS apps that it is ready 
When the SWF files is loading and starting up, the 3rd-party application maybe sending the SWF apps
   events/commands to start/stop webcam. However, these events may be lost because the SWF file isn't
   yet ready to handle the events.
 2013-02-12 20:48:54 +00:00
Richard Alam
4ae34689dc - set the bbbuser status to not talking when she leaves the voice conference 2013-02-12 20:48:32 +00:00
Richard Alam
744f209bcc Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-02-12 20:42:43 +00:00
Chad Pilkey
959c57742a dial-in users get created now and you can't kick dial-in users 2013-02-12 15:17:45 -05:00
Chad Pilkey
915b755762 removing an unneeded file 2013-02-12 12:27:12 -05:00
Richard Alam
2569afb262 Merge branch 'master' into merge-chad-improve-whiteboard-toolbar-pull 2013-02-11 02:01:34 +00:00
Richard Alam
dc24de7743 - change red button to gray and add play icon to the webcam start button 2013-02-11 00:15:40 +00:00
Fred Dixon
f40c3949c9 Merge pull request #92 from capilkey/fix-playback-merge 
fixed my botched playback merge from 3 months ago
 2013-02-09 11:16:49 -08:00
Chad Pilkey
6bf3e1c6e5 fixed my botched playback merge from 3 months ago 2013-02-09 14:13:06 -05:00
Gustavo Salazar
cb07415807 load jquery from server 2013-02-08 16:19:15 -05:00
Chad Pilkey
0920742ae9 added in sort to put phone users at the bottom of the list 2013-02-07 17:24:55 -05:00
Chad Pilkey
a847250cb3 updated config template to replace user and listeners with participants 2013-02-07 17:11:57 -05:00