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

5271 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Richard Alam
a7a85bfd66 - update deskshare jar file 2013-02-07 20:52:52 +00:00
Richard Alam
44084a0825 - update deskshare applet jar 2013-02-07 20:50:02 +00:00
Markos Calderon
d2cc026588 update deskshare jar 2013-02-07 15:49:58 -05:00
Richard Alam
0a233bd391 - fix the problem where the applet will display 800x600 on full screen 2013-02-07 20:47:13 +00:00
Markos Calderon
f9b2600cdc updating jar in order to not show warning message 2013-02-07 13:49:18 -05:00
Richard Alam
d1e80464d8 -disable polling module by default 2013-02-05 20:14:22 +00:00
Richard Alam
b6605f3112 Merge branch 'master' into merge-master-into-polling-module 2013-02-05 18:35:00 +00:00
Richard Alam
200817563f - display mic settings when joining voice from the js api 2013-02-05 18:25:41 +00:00
Richard Alam
43cba65f6d Merge branch 'poll-access' into merge-master-into-polling-module 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollingStatsWindow.mxml
 2013-02-05 16:21:54 +00:00
jtrobinson
e9f9c671f7 Trying to commit workable (but in no way accessible) Polling Module) 2013-02-04 22:37:42 +00:00
jtrobinson
8ad5bc177d Merge branch 'poll-access' of github.com:capilkey/bigbluebutton into poll-access 2013-02-04 22:05:37 +00:00
jtrobinson
88aabc9bbe Trying to undo merge. 2013-02-04 22:05:04 +00:00
jtrobinson
1079f128f0 Fixed conflicts; merging 2013-02-04 19:51:48 +00:00
Richard Alam
93311e6464 Merge branch 'master' into merge-master-into-polling-module 
Conflicts:
	bigbluebutton-client/build.xml
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/src/BigBlueButton.mxml
 2013-02-04 19:34:23 +00:00
Richard Alam
a813662f1d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-02-04 17:10:00 +00:00
Richard Alam
d5ea1099da - update deskshare applet 2013-02-04 17:09:36 +00:00
Markos Calderon
d0ac25672a Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-02-04 11:38:28 -05:00
Markos Calderon
16ef060da3 Merge remote-tracking branch 'fcecagno/playback-in-time' 2013-02-04 11:04:19 -05:00
Fred Dixon
fc250716d9 Updated bbb-conf to support renaming of parameters (see issue 1398 in google issue tracker) 2013-02-03 17:08:38 -05:00
Richard Alam
09a7b9e109 - bringing status messages for deskshare standalone into master 2013-02-01 20:09:39 +00:00
Richard Alam
dcecac18f9 Merge branch 'master' into sync-deskshare-that-will-work-with-0.8-with-master 2013-02-01 19:50:19 +00:00
Richard Alam
7b10ea86a1 - turn off scrollbars 2013-02-01 19:35:26 +00:00
Richard Alam
845c48b056 Merge branch 'master' into listener-does-not-get-displayed-problem 2013-02-01 19:07:38 +00:00
Richard Alam
9a03f4ba71 Merge branch 'master' into style-presentation-upload-window 2013-02-01 19:06:20 +00:00
Richard Alam
66200ea3bc - remove camera names drop down as it's the same as the camera settings button 2013-02-01 19:05:21 +00:00
Richard Alam
8e2e2c83ca Revert "Modified API to be able to map conferences by their name instead of their voiceBridge number. To preserve backwards compatibility is sufficient to pass the voiceBridge number as the conference name in the API call." 
This reverts commit a7156aa0a6.

Command used: git revert a7156aa0a6

Conflicts:

	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
 2013-02-01 17:53:08 +00:00
Richard Alam
77d8df50da - try to figure out why listener doesn't get displayed 2013-02-01 16:35:23 +00:00
Markos Calderon
b4ed805f55 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-02-01 11:24:16 -05:00
Markos Calderon
ab62b91a55 Merge remote-tracking branch 'bikramac/patch-3' 2013-02-01 10:45:02 -05:00
Richard Alam
89c6b7222a - rename config proerpty names so it's more clear on what the properties are for 2013-01-31 22:49:43 +00:00
Richard Alam
ea8488af38 Merge branch 'master' into external_freeswitch 2013-01-31 22:10:56 +00:00
Markos Calderon
d44e00d51b update size of camera settings 2013-01-31 17:02:10 -05:00
Richard Alam
68d8f96730 - change messages 2013-01-31 21:09:37 +00:00
Richard Alam
c16a4636c8 - remove status messages for some events 2013-01-31 17:35:39 +00:00
Richard Alam
cf880ab505 - display status messages on desktop sharing standalone 2013-01-31 17:13:32 +00:00
Richard Alam
9f14252fb3 - use external userID to match voice user. This way, third party apps can use the extern user id on the dialplan when calling from phone. 2013-01-30 23:05:20 +00:00
Markos Calderon
4d27998866 Adding branding for webcam preview 2013-01-30 18:05:02 -05:00