Commit Graph

5440 Commits

Author SHA1 Message Date
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
Chad Pilkey
8702b42def Merge remote branch 'upstream/master' into access-hotfix
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/viewers/views/ViewersWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
2013-02-19 13:45:50 -05: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
Chad Pilkey
2b521b8351 fixed a different presentation edge case bug that I just discovered 2013-02-14 13:07:24 -05:00
Chad Pilkey
b200482840 forgot to put in bounds checks after a zoom, specifically zoom out 2013-02-13 18:02:57 -05:00
Gustavo Salazar
256a9dc200 set text file only when it exists 2013-02-13 17:13:55 -05:00
Chad Pilkey
ecaed7318a Reworked the zoom calculation and fixed it, but I think it can be improved more 2013-02-13 15:07:30 -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
Chad Pilkey
3c25777539 removed the ability to make dial-in users presenter 2013-02-07 17:08:51 -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
Chad Pilkey
7924665c3d the participants module fully works and has been added to the layout manager 2013-02-07 13:50:24 -05:00
Markos Calderon
f9b2600cdc updating jar in order to not show warning message 2013-02-07 13:49:18 -05:00
Chad Pilkey
f486f2f5f1 removed unneeded file 2013-02-07 12:29:26 -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
Chad Pilkey
4eb34ad9ca added in listener SO support, it should work, but can't test because vm is broken 2013-02-04 18:34:50 -05:00