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

57 Commits

Author SHA1 Message Date
jtrobinson
f000b81d22 Starting to refurbish the way hotkeys are handled 2012-12-17 21:50:08 +00:00
Chad Pilkey
02b222625f Merge branch 'master' into access-hotfix 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/model/VideoConfOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
 2012-12-17 15:29:49 -05:00
Richard Alam
d43b7488ce Merge branch 'master' into view-publish-webcam-stanalone 2012-12-14 21:04:06 +00:00
Richard Alam
1dca7b19bf Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2012-12-14 21:02:53 +00:00
Richard Alam
7d4f4b849c - show example on how to use webcam standalone apps 2012-12-14 21:02:05 +00:00
Richard Alam
f6ecdcf775 - preview webcam in standalone app 2012-12-14 20:03:30 +00:00
Richard Alam
06bc130895 - implement view webcam standalone 2012-12-14 16:47:30 +00:00
Richard Alam
30911ef181 Merge branch 'master' into view-publish-webcam-stanalone 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/core/EventConstants.as
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCalls.as
	bigbluebutton-client/src/org/bigbluebutton/main/api/maps/ExternalApiEventMap.mxml
 2012-12-14 16:17:32 +00:00
Richard Alam
2a8f3b7e55 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-12-14 15:32:51 +00:00
Richard Alam
25d46134bb - add example API to query if user is presenter 2012-12-14 15:32:08 +00:00
Richard Alam
46b54043c1 - add API to query if user is presenter 2012-12-14 15:31:21 +00:00
Richard Alam
9d2277d214 Merge branch 'master' into view-publish-webcam-stanalone 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
 2012-12-12 20:06:55 +00:00
Richard Alam
9967668158 - add apis to switch presenter, stop webcam, and leave voice conf 2012-12-12 19:33:33 +00:00
Richard Alam
73906c0acd - add sample api calls for switch presenter, stop sharing cam, and leave voice conf 2012-12-12 19:21:09 +00:00
Richard Alam
b3b03ba9ab - add JS API to preview and view camera 2012-12-11 21:54:51 +00:00
Richard Alam
f4ff05856a - add JS api to share webcam 2012-12-03 21:23:29 +00:00
Chad Pilkey
b4cb759797 Better descriptions for rest of whiteboard buttons. Added button to focus into the flash content. 2012-11-28 11:04:26 -05:00
Chad Pilkey
38dd3dc427 added better accessibility names for some of the whiteboard toolbar 2012-11-23 18:04:17 -05:00
Richard Alam
5ca6267e69 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2012-11-21 19:12:22 +00:00
Richard Alam
65c835a761 - add listener for voice mute, join/leave, and locked 2012-11-21 19:10:46 +00:00
Richard Alam
c63b312d55 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-11-20 20:22:32 +00:00
Richard Alam
200d770b4f - add JS api to query user id 2012-11-20 20:20:12 +00:00
Richard Alam
e67465afc7 - add JS api to query user's id 2012-11-20 19:58:47 +00:00
Richard Alam
787e1de310 - pass external meeting id to the client and provide JS api to query it 2012-11-20 19:30:08 +00:00
Richard Alam
fa35d4bfca - add sample to query meeting id 2012-11-20 19:27:23 +00:00
Richard Alam
bb20a2a7f9 Merge branch 'send-receive-chat-from-js-api' of github.com:bigbluebutton/bigbluebutton into send-receive-chat-from-js-api 2012-11-01 19:38:11 +00:00
Richard Alam
7f8d4f5df5 - add a way to lock unlock layout from JS API 2012-11-01 19:37:34 +00:00
Richard Alam
3265e6c2a1 - add example in 3rd party html to lock unlock layout 2012-11-01 18:45:51 +00:00
Richard Alam
9ab215e98e - setup dir structure 2012-10-24 22:08:58 +00:00
Richard Alam
258175545b - add more structure 2012-10-24 21:27:44 +00:00
Richard Alam
d05c7090fa - add underscore JS lib 2012-10-24 21:09:21 +00:00
Richard Alam
97cb44293a Merge branch 'send-receive-chat-from-js-api' of github.com:bigbluebutton/bigbluebutton into send-receive-chat-from-js-api 2012-10-24 19:58:55 +00:00
Richard Alam
3cce928ebc - add backbone.js lib 2012-10-24 19:58:33 +00:00
Richard Alam
3879cc446c - register for event listeners on load 2012-10-24 19:28:24 +00:00
Richard Alam
1639c624ca - don't need userid when sending chat thru JS as we can determine the userid from within flash 2012-10-24 19:07:33 +00:00
Richard Alam
b40a05b904 - add echo private message to test sending of private message from JS api 2012-10-18 20:32:20 +00:00
Richard Alam
87fe30e30b - add hook to send public chat message from JS 2012-10-18 20:17:51 +00:00
Richard Alam
65ce77f911 - add JS API to switch layout 2012-10-18 14:17:12 +00:00
Richard Alam
8f84fd2eef - add mute/unmute all 2012-10-05 21:07:22 +00:00
Richard Alam
8e9475ecfd - add muteme/unmuteme api 2012-10-05 20:54:45 +00:00
Richard Alam
1dabeca677 - rename bbb_sdk.js to reflects it's an api bridge between js and flash 
- rename event to reflect it's a request to share camera
 2012-10-05 18:27:17 +00:00
Richard Alam
43f2524d0f - provide a way to query user's role 2012-10-04 21:24:10 +00:00
Richard Alam
bb024cb971 - add example 3rd-party.js to interact with BBB through JS api 2012-10-04 19:46:23 +00:00
Richard Alam
0303e01828 - fix problem where we are not notifying the listeners of events 2012-10-04 14:55:55 +00:00
Richard Alam
64724c4104 - setup bbb-sdk so that 3rd-party js can interact with BBB 2012-10-03 19:55:36 +00:00
Richard Alam
8e967a9797 - add hook to start webcam 2012-09-27 14:30:35 +00:00
Richard Alam
870bd93013 - move bbb-api-bridge into it's onwn js file 
- rename the api method names
 - cleanup
 2012-09-12 16:00:38 +00:00
Richard Alam
76f94df0a1 - creating JS hooks 2012-08-21 22:02:24 +00:00
Richard Alam
e04da4042a Merge remote branch 'rsippl/deskshare-improvements' into merge-svc2-deskshare 
Conflicts:
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.8.jar
	deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/net/NetworkHttpStreamSender.java
 2012-08-17 19:21:34 +00:00
jtrobinson
5530863201 Audio notifications cleaned up; ctrl-shift-r added to navigate to latest read message 2012-08-10 21:01:54 +00:00