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

294 Commits

Author SHA1 Message Date
Chad Pilkey
493696d1f2 Merge remote branch 'origin/master' into access-hotfix 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
 2013-01-10 14:36:57 -05:00
Richard Alam
92d483eae1 - update events from Flash client 2013-01-09 19:43:56 +00:00
Richard Alam
6303de3007 - extract webcam control icons 2013-01-08 20:04:03 +00:00
Chad Pilkey
6e002d966e Merge remote branch 'origin/master' into access-hotfix 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
 2013-01-08 14:00:46 -05:00
Richard Alam
051c55c37d - modify default config.xml 2013-01-07 15:54:20 +00:00
Richard Alam
2ac2d651aa - add layout with notes and broadcast 2013-01-07 15:39:46 +00:00
Chad Pilkey
b3a6e1e552 Merge remote branch 'upstream/master' into access-hotfix 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/ClearButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/LineButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/PanZoomButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/RectangleButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/ScribbleButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/TextButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/UndoButton.mxml
 2013-01-04 14:03:39 -05:00
Richard Alam
6b95383957 - handle response when saving note 2013-01-03 20:44:32 +00:00
Richard Alam
be04295217 remove scrollbars on chat input box 2013-01-02 13:39:47 +00:00
Richard Alam
7c58ed3c95 - try to display notes window 2013-01-02 01:45:48 +00:00
Richard Alam
6b36e0011a - build BBB default style 2012-12-28 17:32:14 +00:00
Richard Alam
968a56d556 - add broadcast window to layout as exception occurs when the module is loaded 2012-12-27 19:12:14 +00:00
Richard Alam
899bab170c - make broadcast module be displayed using layout manager 2012-12-26 19:34:22 +00:00
Richard Alam
55cfea9ceb Merge branch 'updating-broadcast-module' of github.com:bigbluebutton/bigbluebutton into updating-broadcast-module 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/broadcast/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/broadcast/services/MessageSender.as
 2012-12-26 17:26:08 +00:00
Richard Alam
3418876adc - add options in config template 2012-12-24 19:42:50 +00:00
Richard Alam
5cba147cf8 - fix error on layout for broadcast module 2012-12-21 20:55:23 +00:00
Richard Alam
cbcd54cd7b - update broadcast module to work on master 2012-12-21 20:34:33 +00:00
Richard Alam
f80fcfbc46 - provide absolute url where to load the skin swf file 2012-12-18 20:57:56 +00:00
Richard Alam
20487a75cb - add a way to specify that the windows can be resized or dragged 2012-12-18 20:01:34 +00:00
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
1ab06e37b3 - try skinning 2012-12-17 20:06:12 +00: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
50aa8dfd24 - add option to enable displaying of avatar 2012-12-04 19:09:45 +00:00
Richard Alam
f4ff05856a - add JS api to share webcam 2012-12-03 21:23:29 +00:00
Richard Alam
1cd682e1e0 - pass avatar in avatarURL during join API call. Have a default avatarURL 2012-12-02 10:57:58 +00:00
Chad Pilkey
f3dff5b249 You can now focus into flash with a button and get out with a shortcut key (ctrl shift Q) 2012-11-28 15:29:17 -05:00
Chad Pilkey
f0a19f1640 removed obsolete object code 2012-11-28 12:24:13 -05: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
jtrobinson
41b59d6e92 Fixed mistake in config.xml.template, updated README 2012-11-23 18:25:33 +00:00
jtrobinson
b6617ac58b Deskshare and webcam publishing included in tab order. Some tweaking required. 2012-11-22 21:43:31 +00: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