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

2663 Commits

Author SHA1 Message Date
Richard Alam
7ae3b57af4 - inclue icons into CSS file 2012-12-20 16:55:10 +00:00
jtrobinson
e3ef32b3d8 Share Desktop/Webcam/Microphone hotkeys are done. Added accessible Close buttons to Webcam and Microphone popups. 2012-12-20 16:20:24 +00:00
Richard Alam
61bc87e925 - replace icons 2012-12-19 23:12:27 +00:00
Richard Alam
f0ca107f7f -add styling of whiteboard toolbar 2012-12-19 22:36:34 +00:00
jtrobinson
821026b39c Fixed some minor bugs, added Deskshare and Webcam Share hotkeys, working on Microphone Share 2012-12-19 20:21:45 +00:00
Richard Alam
12929d25e8 - add message receiver and sender 2012-12-19 19:44:30 +00:00
Richard Alam
39953cf78e - drag in broadcast module into 0.81 2012-12-19 16:08:17 +00:00
jtrobinson
46b014337a Hotkeys keys in place to focus major windows; working on keys to share desktop, webcam, microphone 2012-12-18 22:49:02 +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
Richard Alam
e5cf191935 - add BBB default css 2012-12-17 21:03:21 +00:00
Richard Alam
cb8ce1033d - make whole video window glow 2012-12-17 20:49:14 +00:00
Richard Alam
df9ddeef65 - fix problem where voice doesn't send events when triggered from html 2012-12-17 20:41:44 +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
1914ab7dbc Merge pull request #80 from capilkey/fix-presentation-pan 
fix presentation panning issue when presentation is higher then wide and...
 2012-12-17 07:38:28 -08: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
1cd749290b - clear video holder when presenter stops sharing video 2012-12-14 21:01:17 +00:00
Richard Alam
2294c6300e - view presenter webcam stream in standalone app 2012-12-14 20:24:52 +00:00
Richard Alam
f6ecdcf775 - preview webcam in standalone app 2012-12-14 20:03:30 +00:00
Chad Pilkey
bfb6126395 fixing another unreported error that made a viewers slide viewport's width distorted 2012-12-14 12:03:23 -05: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
1c2908911f Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2012-12-14 15:32:32 +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
5ca219523e - add webcam view standalone app 2012-12-13 21:02:44 +00:00
Richard Alam
c271c6507d - cleanup 2012-12-13 20:10:25 +00:00
Richard Alam
5d26986064 - cleanup 2012-12-13 19:52:00 +00:00
Richard Alam
32e387ed1d - display webcam preview 2012-12-13 19:50:44 +00:00
Chad Pilkey
0b076b4f13 fix presentation panning issue when presentation is higher then wide and the PresentationWindow is too small to fit the slide 2012-12-13 13:13:09 -05:00
Richard Alam
36af827f9b Merge branch 'master' into view-publish-webcam-stanalone 2012-12-13 17:15:47 +00:00
Richard Alam
52a5c6cc46 Merge branch 'network-stats' into merge-bw-stats 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
 2012-12-12 21:26:31 +00:00
Richard Alam
0b4527ab2b Merge branch 'network-stats' into merge-bw-stats 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
 2012-12-12 20:41:13 +00:00
Richard Alam
129c4f1aff - fix compile problem 2012-12-12 20:20:42 +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
c95e8470d4 - add api call when user is sharing webcam 2012-12-11 21:32:31 +00:00
Richard Alam
710901a745 - add query cam settings API 2012-12-11 19:55:05 +00:00
Richard Alam
565fe826c1 - provide API to query if presenter or not 2012-12-10 22:32:43 +00:00
Richard Alam
5a95875968 - hash the meeting id with the config xml 2012-12-10 19:05:41 +00:00
Richard Alam
02c6121a6c - rename set and get configxml api 2012-12-09 20:44:52 +00:00
Richard Alam
1f620583a2 - allow passing of configURL in create and join api calls 2012-12-09 00:23:33 +00:00
Felipe Cecagno
1523774a1c the NetworkStatsWindow is already presenting the measured bandwidth up/down between client and server; still need to figure out a better way to present the window into the screen 2012-12-08 18:45:00 -02:00
Felipe Cecagno
b4f36b894c Merge branch 'add-some-bandwidth-monitoring' of git://github.com/bigbluebutton/bigbluebutton into network-stats 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
 2012-12-08 14:36:10 -02:00
Felipe Cecagno
bc9457bba2 created the model NetworkStatsData to hold all the network data, and made the display window to retrieve the data from this model 2012-12-08 13:55:52 -02:00
Felipe Cecagno
b5ae953c1e reverted some unwanted changes done during the merge; fixed the total bytes counter 2012-12-07 17:35:14 -02:00
Richard Alam
bb4caf1d5b - try adding some bw monitoring 2012-12-07 19:20:55 +00:00
jtrobinson
301da96c11 More accessibilityName properties added 2012-12-07 18:18:17 +00:00
Felipe Cecagno
4bed1f8fb6 Merge branch 'master' into network-stats 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
 2012-12-07 14:32:47 -02:00
Richard Alam
8c20098ae9 - import red5's BW detection sample 2012-12-06 23:17:37 +00:00
Richard Alam
c89944fb0a - fix error on toolbar 2012-12-06 21:58:57 +00:00
Richard Alam
1bc06e96df - allow user to set Flash to remember choice when asking permission to access the mic 2012-12-06 21:42:24 +00:00
Richard Alam
8ae85e9dd4 - try to display webcam preview in standalone app 2012-12-06 21:29:41 +00:00
Chad Pilkey
12ddd20b5f security settings now allows you to save your choice 2012-12-06 16:22:48 -05:00
jtrobinson
d279f4162b Started modifiyng english locale to make buttons more clear for screen-reader users 2012-12-06 20:33:46 +00:00
Richard Alam
1fd4504613 - build a webcam preview standalone app 2012-12-06 20:23:03 +00:00
jtrobinson
a4a4571ca9 Whiteboard buttons now presented in the correct order using JAWS B key 2012-12-06 19:12:05 +00:00
Richard Alam
3284adb4f4 - Change how chat messages are displayed 2012-12-06 16:46:48 +00:00
Richard Alam
86c45f8051 - fix problem where user is seen as talking when muted 2012-12-06 15:47:59 +00:00
Richard Alam
1754feea5d - try positioning the control buttons properly on startup 2012-12-04 19:49:29 +00:00
Richard Alam
3604c95601 Merge branch 'master' into display-avatar-when-cam-is-not-on 2012-12-04 19:16:53 +00:00
Richard Alam
50aa8dfd24 - add option to enable displaying of avatar 2012-12-04 19:09:45 +00:00
Chad Pilkey
c938938cd6 Cleaning up some comments 2012-12-04 14:07:55 -05:00
Richard Alam
4398ddf2c4 - clean up 2012-12-04 19:01:23 +00:00
jtrobinson
db39fadc51 Shortcut bug appears to be solved 2012-12-04 18:43:30 +00:00
jtrobinson
a10a5660f4 Trying to resolve merge 2012-12-04 16:55:36 +00:00
jtrobinson
d86dbcb423 Trying to merge 2012-12-04 16:34:25 +00:00
Richard Alam
0430b30c8e - stop publishing when requested from the toolbar button 2012-12-03 22:15:06 +00:00
Richard Alam
f4ff05856a - add JS api to share webcam 2012-12-03 21:23:29 +00:00
Richard Alam
d6377fe89e - create stanalone app to publish or view presenter's webcam 2012-12-03 21:22:57 +00:00
Richard Alam
ae63f3779e - stop publishing if presenter only options is enabled and the user has become viewer 2012-12-03 19:18:01 +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
Richard Alam
12992be997 - get avatar window to maintain aspect ratio 2012-11-29 21:54:40 +00:00
Richard Alam
ec5263f0ef - fix problem where avatar window for another is being closed 2012-11-29 21:38:16 +00:00
Richard Alam
31180430ff - don't remove all windows when trying to figure out if the window needs to be removed or not 2012-11-29 18:50:38 +00:00
Richard Alam
ab3d940811 - fix some exceptions when user is joining 2012-11-29 18:28:31 +00:00
Richard Alam
91435ed304 - view webcam when clicking on webcam icon in viewer's window 2012-11-28 22:28:58 +00:00
Richard Alam
c12d5e2582 - don't send stop webcam several times 2012-11-28 20:49:50 +00:00
Richard Alam
7f5befa9bc - view user's webcam 2012-11-28 20:42:24 +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
Richard Alam
dcebccf54c - move things around 2012-11-28 19:31:02 +00:00
Richard Alam
217d923e2a - stop publishing when closing webcam...the camera now turns off. 2012-11-28 18:19:35 +00: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
Richard Alam
8edcce38c1 - figure out why we can't close windows properly 2012-11-27 22:19:35 +00:00
Richard Alam
9a645910be - display publish window with correct aspect ratio 2012-11-27 18:42:19 +00:00
Richard Alam
1b3e3e5332 - display publish window 2012-11-27 18:25:44 +00:00
Richard Alam
56cd5f78ec - display webcam preview in modal dialog 2012-11-27 16:57:18 +00:00
Richard Alam
59527aa5e8 - close publish window and open avatar window 2012-11-26 22:12:14 +00:00
Richard Alam
3386b744f6 - remove avatar when publishing 2012-11-26 21:51:03 +00:00
Richard Alam
779a44d07b - open avatar, publish, view windows 2012-11-26 21:10:31 +00:00
Richard Alam
b519750e24 - adding more logs to mute/unmute events 2012-11-26 17:24:19 +00:00
Richard Alam
ecb1f45141 - open view window 2012-11-26 16:30:43 +00:00
Chad Pilkey
38dd3dc427 added better accessibility names for some of the whiteboard toolbar 2012-11-23 18:04:17 -05:00
Richard Alam
23f3157315 - open avatar window 2012-11-23 22:06:19 +00:00
Richard Alam
4d4cbeee79 - start video module when video dock is ready 2012-11-23 21:37:20 +00:00
Richard Alam
7485de0c74 - remove building unneeded modules 2012-11-23 21:25:22 +00:00
Richard Alam
d0bba49293 - enable debugging 2012-11-23 21:20:15 +00: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
jtrobinson
357b3f52d2 Tab order no longer requires modifying config.xml; about to try including deskshare, etc 2012-11-22 20:24:29 +00:00
Richard Alam
e03cbdf17c - override measure on List class to see if it can calculate the height of the list properly 2012-11-22 14:47:11 +00:00
Richard Alam
0425dae9da - try to fix scrollbar on chat 2012-11-21 21:24:48 +00:00
Richard Alam
5ca6267e69 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2012-11-21 19:12:22 +00:00
Richard Alam
4f0d516fe0 - send user mute, locked, and join/leave events 2012-11-21 19:11:27 +00:00
Richard Alam
65c835a761 - add listener for voice mute, join/leave, and locked 2012-11-21 19:10:46 +00:00
Richard Alam
082e5ec057 - dispatch event on mute and unmute listener 2012-11-20 20:29:53 +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
16a528ad57 - store meetingID and meeting name 2012-11-20 20:17:41 +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
jtrobinson
4006026f93 Merge branch 'access-hotfix' of github.com:capilkey/bigbluebutton into access-hotfix 2012-11-20 17:05:43 +00:00
jtrobinson
862551a117 Updated README with instructions on implementing Tab Order 2012-11-20 17:05:29 +00:00
Chad Pilkey
fafe078ab0 Merge branch 'access-hotfix' of github.com:capilkey/bigbluebutton into access-hotfix 2012-11-20 12:04:40 -05:00
Chad Pilkey
a87a93d6ff Merge remote branch 'origin/master' into access-hotfix 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
 2012-11-20 12:04:23 -05:00
jtrobinson
4c13b70a7b Remember to use the baseTabIndex values in config.xml.template for tab order to work 2012-11-20 16:53:45 +00:00
Chad Pilkey
7ab21cfc3f Changed the MDIWindow resize handles from Buttons to Canvas 2012-11-16 12:57:33 -05:00
Chad Pilkey
a368e45ee9 started to fix mdi windows edge buttons 2012-11-15 16:08:07 -05:00
jtrobinson
33dd21e263 All 'main screen' components have a tabIndex, although tab order is not complete yet. 2012-11-15 19:41:44 +00:00
jtrobinson
ecb3dc0514 Presentation module updated with tab order; shortcut keys bug has resurfaced 2012-11-15 16:07:23 +00:00
jtrobinson
7db48925e6 Added tab order to Viewer, Listener modules. Added it to Video Dock, mostly for consistency's sake, since though there's really nothing there right now. Noticed that Listener's datagrid seems to be missing. 2012-11-14 17:31:59 +00:00
jtrobinson
59186b536c Main Toolbar is set up for tab indexes. 2012-11-14 16:16:13 +00:00
Richard Alam
763573319c - remove ability to drag webcam window from inside video dock 2012-11-13 18:45:53 +00:00
Richard Alam
1921fc96db - add avatar icon 2012-11-13 18:45:25 +00:00
jtrobinson
567d9a8453 Merge branch 'access-hotfix' of github.com:capilkey/bigbluebutton into access-hotfix 2012-11-13 14:48:38 +00:00
Chad Pilkey
d553303c87 trying to fix the minimize/maximize and phhantom buttons which are noww foundd 2012-11-12 23:13:33 -05:00
Richard Alam
e63bbfc449 - pass defaultLayout in join api call 2012-11-12 21:05:23 +00:00
jtrobinson
d1efd13615 Shortcut keys are working again; strange intermittent bug may or may not still be present, hard to tell 2012-11-09 21:37:15 +00:00
Chad Pilkey
bffa94038d started labelling window control buttons with more descriptive acessibility descriptions 2012-11-08 18:19:09 -05:00
jtrobinson
da7a6bc5a3 Fixed chat input focus bug, working on new shortcut-keys-don't-register bug 2012-11-08 19:43:03 +00:00
Richard Alam
6adf6b516e Merge branch 'master' into send-receive-chat-from-js-api 2012-11-07 16:13:35 +00:00
jtrobinson
470b6fee43 Testing tab order; focus bug on ChatBox.mxml TextArea/TextInput 2012-11-06 20:59:55 +00:00
Richard Alam
f3df5b1a7c Merge branch 'send-receive-chat-from-js-api' of github.com:bigbluebutton/bigbluebutton into send-receive-chat-from-js-api 2012-11-05 22:30:05 +00:00
Richard Alam
817ceac330 - sample layout with window hidden 2012-11-05 22:29:27 +00:00
Richard Alam
28ae96961d - hide window marked hidden in layout 2012-11-05 22:29:03 +00:00
Fred Dixon
e2b446c0e0 Fixed include in BigBlueButton.html to point to correct file: bbb_api_bridge.js 2012-11-05 13:41:14 -05:00
Felipe Cecagno
4695d3ec99 fixing the layout manager startup, just like it was done on master 2012-11-04 21:09:17 -02:00
Richard Alam
177ff0a753 - add switch presentation button 2012-11-02 17:09:34 +00:00
Richard Alam
b1800200fa - add present layout 2012-11-01 21:08:00 +00:00
Richard Alam
2af0b5cb22 - add tooltips for control buttons 2012-11-01 20:33:31 +00:00
Richard Alam
e215dfa34d - fix problem where drawing scribbles doesn't store history 2012-11-01 19:38:22 +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
6bb0920988 Merge branch 'send-receive-chat-from-js-api' of git://github.com/bigbluebutton/bigbluebutton into send-receive-chat-from-js-api 2012-11-01 18:46:30 +00:00
Richard Alam
3265e6c2a1 - add example in 3rd party html to lock unlock layout 2012-11-01 18:45:51 +00:00
jtrobinson
f7d56f6d76 Switching to work on another branch for a whi while. Stats window is close to working. 2012-11-01 18:30:04 +00:00
Richard Alam
c85ae5b760 - add options in config.xml to display the webcam controls 2012-11-01 17:46:43 +00:00
Richard Alam
69a9e980e4 - show control buttons for presenter only 2012-10-31 20:50:32 +00:00
Richard Alam
72e71e9664 - change chat icon 2012-10-30 17:44:11 +00:00
Richard Alam
085b7c35cb - use event to start private chat 2012-10-30 17:30:08 +00:00
Richard Alam
cfcaed82f1 - add a way to start private chat from webcam window 2012-10-30 17:12:54 +00:00
Richard Alam
aae0fa1d33 - glow when user if talking 2012-10-30 16:14:59 +00:00
jtrobinson
172c19c714 Overhauling PollingStatsWindow, nearly got it fixed 2012-10-29 21:08:45 +00:00
Chad Pilkey
0c6e5a0632 Merge remote branch 'origin/master' into poll-access 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/core/managers/UserManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	record-and-playback/presentation/playback/presentation/acornmediaplayer/acornmediaplayer.base.css
	record-and-playback/presentation/playback/presentation/acornmediaplayer/jquery.acornmediaplayer.js
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-captions-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-captions.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-exit-fullscreen-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-exit-fullscreen.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-fullscreen-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-fullscreen.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-pause-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-pause.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-play-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-play.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-transcript-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-transcript.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume-full-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume-full.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/acorn.access.css
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/button-background-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/button-background-light.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/controls-background-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/controls-background-light.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/barebones/acorn.barebones.css
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/acorn.darkglass.css
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-caption.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-exit-fullscreen.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-fullscreen.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-pause.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-play.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-transcript.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-volume-full.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-volume.png
	record-and-playback/presentation/playback/presentation/css/bbb.playback.css
	record-and-playback/presentation/playback/presentation/playback.html
 2012-10-29 16:03:09 -04:00
Richard Alam
b74f778287 Merge branch 'master' into add-more-controls-to-webcam-window 2012-10-29 18:52:56 +00:00
Richard Alam
24fab2c5d9 - fix problem where previous whiteboard shape gets deleted 2012-10-29 18:52:03 +00:00
Felipe Cecagno
bed079e70d when the user saves the layout, the output file shouldn't present the <layout-block> tag - this is just internal to exchange layouts among the participants 2012-10-29 16:24:09 -02:00
Richard Alam
6bfcb151a9 - add talking icon on viewer's cam window 2012-10-29 16:26:34 +00:00
Richard Alam
488565ce32 - add talking indicator in webcam video 2012-10-29 15:57:34 +00:00
Richard Alam
8fc5de26f5 - allow ejecting of user from webcam controls 2012-10-29 15:19:14 +00:00
Richard Alam
e199c0993c - allow manage of publishere from webcam window 2012-10-29 14:51:50 +00:00
Felipe Cecagno
c6556e90e3 Merge tag 'v0.8' into layout-module 
- tagging version 0.8
 2012-10-29 11:27:38 -02:00
Richard Alam
f5550549ce - hook events to webcam 2012-10-28 21:04:35 +00:00
Richard Alam
eb3e1cbc5b - switch presenter from webcam window 2012-10-28 19:56:34 +00:00
Richard Alam
e29a347689 - add require.js lib 2012-10-24 22:15: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
210aa51e9a - add more events 2012-10-24 21:09:56 +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
09926ef823 - cleanup 2012-10-24 18:09:12 +00:00
Richard Alam
959e6ba7da - remove auto-reconnect experimentation. Listeners, presentation, and users doesn't get updated 
properly. Will do refactoring properly for reconnects.
 2012-10-24 14:24:15 +00:00
Richard Alam
8d7a21f773 - TESTING! Add button to force closing of connection. 2012-10-23 21:56:32 +00:00
Richard Alam
fdd0284756 - TESTING! Show alert when attempting to reconnect. 2012-10-23 21:11:33 +00:00
Richard Alam
589c515d1f - don't need to display hint when client is not Tunnelling 2012-10-23 20:54:32 +00:00
Richard Alam
c25f57c8a5 - TESTING! Let's see how the client behaves when we reconnect when Flash closes the connection on RTMPT 2012-10-23 20:52:31 +00:00
Richard Alam
08231a7212 - display if user is tunnelling or not 2012-10-23 19:44:24 +00:00
Richard Alam
999e6f6d0f - add [Tunnelling] text on footer when tunnelling so it's easy to see if client is using RTMPT 2012-10-23 18:19:25 +00:00
Richard Alam
f298f2f687 - send presentation cursor update very 100ms instead of every 1sec 2012-10-23 17:44:44 +00:00
Richard Alam
50ea67c877 - use hand cursor when hand tool is selected 2012-10-22 17:28:24 +00:00
Richard Alam
d0e7909471 - cleanup 2012-10-22 17:28:12 +00:00
Richard Alam
969b8a3ab3 - make toolbar and footer visibilty configurable. The toolbar and footer can be hidden by 
setting showToolbar="true" showFooter="true" to "false"
 2012-10-22 17:10:20 +00:00
Richard Alam
a9e6a2a55e Merge branch 'master' into add-more-controls-to-webcam-window 2012-10-22 15:53:23 +00:00
Richard Alam
e859c78795 - don't display the + chat tab when private chat is disabled 2012-10-22 15:52:01 +00:00
Richard Alam
cf30a3cf2c - add more buttons to webcam 2012-10-22 14:54:57 +00:00
Fred Dixon
af96609e86 Set use h.264 video to true. We may revert this to false in the future 2012-10-22 10:42:23 -04:00
Richard Alam
b70d29a7d0 - change advancing to next chat message for accessibility from Key 32 (space) to Shift-Alt-32. The 
reason is that we need to listen for keystroke and trap the ENTER key when we allowed input of
   text in several line by converting to TextArea from TextField.
 2012-10-21 18:25:54 +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
2c60f8dab7 - try scrolling to the last message 2012-10-18 18:32:59 +00:00
Richard Alam
8274c491d4 - fix problem where chat box message area not showing up when switching layouts 
- listen for user leave event and disable chat area
 2012-10-18 17:32:41 +00:00
Richard Alam
ec05cf0129 - add switch layout button 2012-10-18 17:32:01 +00:00
Richard Alam
65ce77f911 - add JS API to switch layout 2012-10-18 14:17:12 +00:00
Richard Alam
d2ad9c68d1 - add a way to override default layout using config.xml 2012-10-17 21:44:15 +00:00
Richard Alam
ffb19fe329 - use timer to trigger querying of chat history as the text box input disappears if we don't 2012-10-17 20:40:53 +00:00
Richard Alam
8673a31d75 - try to display welcome message 2012-10-17 20:05:52 +00:00
Richard Alam
9aa4f274c3 - pass utc time and timezone offset when sending chat message so we can display the send time by converting to local time 2012-10-17 15:41:41 +00:00
Richard Alam
0cfc9fabec - request for chat history when joining the meeting 2012-10-17 14:34:34 +00:00
Richard Alam
ac297d2f1a - focus to chat message input when switching tabs 2012-10-16 22:05:01 +00:00
Richard Alam
314d0edf39 - send message to self when sending private chat 2012-10-16 21:30:49 +00:00
Richard Alam
b19a5440b5 - hightlight tab if new message comes in and tab is not in focus 2012-10-16 21:04:26 +00:00
Richard Alam
322bc98112 - send chat message when user hit enter key 2012-10-16 20:22:34 +00:00
Richard Alam
b4e1bee033 - display private chat message 2012-10-16 18:46:49 +00:00
Richard Alam
a6b4559c34 - display public chat message 2012-10-16 17:40:52 +00:00
Richard Alam
65dc16646c - propagate public chat to 3rd party 2012-10-15 21:00:43 +00:00
Richard Alam
4ea488b6d0 - propagate private chat message to 3rd party 2012-10-15 20:53:34 +00:00
Richard Alam
4f2db7678a - send and receive chat messages using conn invoke instead of shared object 2012-10-15 19:43:49 +00:00
Richard Alam
7f14c11e64 Merge branch 'master' into modify-chat-to-use-consolidated-users 2012-10-15 14:33:46 +00:00
Richard Alam
7597c4edb0 - just moving stuff around 2012-10-12 22:07:47 +00:00
Richard Alam
88e22a818e - try to display chat message 2012-10-12 21:30:29 +00:00
Richard Alam
07bd263089 - move chat message input to each chat box so we don't have to jump thru hoops to send a message 2012-10-12 19:24:01 +00:00
Richard Alam
f6b16f678c Merge branch 'master' into modify-chat-to-use-consolidated-users 2012-10-12 19:06:19 +00:00
Chad Pilkey
7396417780 fixed the client size in IE 2012-10-12 18:22:09 +00:00
Richard Alam
e1cd0cadae - don't include port when trying to set security domain 2012-10-12 17:55:37 +00:00
Richard Alam
01abe4f8f2 - move things around...broken..won't compile 2012-10-12 16:00:27 +00:00
Chad Pilkey
172eae1891 Merge remote branch 'origin/master' into poll-access 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
 2012-10-12 15:43:18 +00:00
Chad Pilkey
4712397028 Merge remote branch 'upstream/master' 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
 2012-10-12 15:41:03 +00:00
Richard Alam
0a570db23a - allow to enter multi-line text into chat 2012-10-11 18:22:43 +00:00
Richard Alam
2ed222b412 - remove some logging 2012-10-11 15:49:37 +00:00
Richard Alam
4891d812a8 - don't view own webcam 2012-10-11 15:44:05 +00:00
Richard Alam
32dbce3f83 - don't open 2 publish windows 2012-10-11 15:17:40 +00:00
Richard Alam
d674b36c94 - fix tooltip 2012-10-11 15:04:47 +00:00
Richard Alam
8e358c55fb - store chant message 2012-10-11 10:51:00 +00:00
Richard Alam
ad8dc0e2c8 - store chat messages 2012-10-11 09:25:07 +00:00
Richard Alam
ceff2ea131 - start refactoring chat module to have a proper data model so we can expose to JS API 2012-10-11 22:08:18 +00:00
Richard Alam
5393055cb8 - display public chat tab properly 2012-10-11 20:05:40 +00:00
Richard Alam
8d4e781bdc - change how we get the data to display users for private chat. Start consolidating data in preparation for 
combining users and listeners.
 2012-10-11 19:48:02 +00:00
Richard Alam
e860863502 - propagate external user id to clients 2012-10-10 21:38:20 +00:00
Richard Alam
182427d9a9 Merge pull request #64 from mconf/preloader-fix 
Fixing the bigbluebutton preloader to better fit the text "Downloading BigBlueButton"
 2012-10-09 13:46:00 -07:00
Chad Pilkey
30f330b143 Merge remote branch 'origin/master' into poll-access 2012-10-09 17:34:20 +00:00
Chad Pilkey
c3b7c064f4 Merge remote branch 'upstream/master' 2012-10-09 17:26:27 +00:00
Richard Alam
09c73338a2 Merge remote branch 'mconf/camera-usability-improvement' 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
 2012-10-08 04:07:31 +00:00
Richard Alam
117bc0ebe6 - broadcast event when role has changed 2012-10-08 01:50:32 +00:00
Richard Alam
6e602c4b1d - add mute/unmute all buttons 2012-10-08 00:56:57 +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
e726a4d6c5 - add button to display the flash client 2012-10-05 17:39:45 +00:00
Richard Alam
e84b82659c - implement user join and left events 2012-10-04 21:55:51 +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
a067b8380b Merge branch 'master' into start-layout-manager-first 2012-10-03 14:19:46 +00:00
Richard Alam
4d51be0f58 - fix double vertical scrollbars when the chat window becomes too narrow 2012-10-03 14:17:50 +00:00
Richard Alam
c528fc6997 - change default layout 2012-10-02 20:22:42 +00:00
Richard Alam
a71069017f - make layoutUrl option full URL 2012-10-02 20:22:12 +00:00
Richard Alam
7343fa181c - fix switch presenter 2012-10-02 20:15:34 +00:00
Richard Alam
0dca41bc14 - fix muteémute button 2012-10-02 18:06:04 +00:00
Richard Alam
2c6b067b01 - convert userid from Number to String 2012-10-02 17:23:15 +00:00
Richard Alam
8c7d465a5a Merge branch 'master' into start-layout-manager-first 2012-10-02 15:28:23 +00:00
Chad Pilkey
dea6a89dd0 Merge remote branch 'origin/master' into poll-access 2012-10-02 14:58:41 +00:00
jtrobinson
a4c47fd46a Syncing local ocal repo 2012-10-02 18:52:12 +00:00
Chad Pilkey
0a7ab07727 Merge remote branch 'upstream/master' 
Conflicts:
	record-and-playback/presentation/playback/presentation/playback.js
 2012-10-01 21:00:32 +00:00
Richard Alam
789b4b03b6 - missed a couple of new files 2012-10-01 17:28:50 +00:00
Richard Alam
5338c823c2 - use connection invoke instead of shared object when sending mouse cursor events in presentation 2012-10-01 15:44:54 +00:00
jtrobinson
f5a858e1c2 Solved duplicate voting window issue 2012-09-27 19:20:07 +00:00
jtrobinson
e7207a2e94 Focus issues aes are mostly resolved, but polling is currently not ready for use. 2012-09-27 16:36:05 +00:00
Richard Alam
8e967a9797 - add hook to start webcam 2012-09-27 14:30:35 +00:00
Richard Alam
ca76d3c41d - start layout module first 2012-09-26 20:59:07 +00:00
jtrobinson
f26dc9305a Some focus issues still present 2012-09-26 19:20:03 +00:00
Chad Pilkey
1557318b32 Merge remote branch 'origin/master' into poll-access 2012-09-24 19:01:36 +00:00
Chad Pilkey
14b7b5500f Merge remote branch 'upstream/master' 2012-09-24 19:01:04 +00:00
Chad Pilkey
f9b501f1f0 Merge remote branch 'origin/master' into poll-access 2012-09-24 15:16:02 +00:00
Chad Pilkey
97bfcbb068 Merge remote branch 'upstream/master' 
Conflicts:
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/BigBlueButton.mxml
	record-and-playback/presentation/playback/presentation/css/bbb.playback.css
	record-and-playback/presentation/playback/presentation/playback.html
	record-and-playback/presentation/playback/presentation/playback.js
 2012-09-21 21:27:23 +00:00
Richard Alam
80744c488f - continue drawing when the mouse temporarily moves out of the canvas 2012-09-21 21:06:11 +00:00
Richard Alam
d3ff17ab05 - extract bbb-api-bridge into it's own js file 2012-09-20 16:17:57 +00:00
Chad Pilkey
343be6d3e0 cleaned up the polling module a little 2012-09-19 21:07:36 +00:00
jtrobinson
7300228e29 Focus issues on Polling Instructions Window finally resolved through use of a Timer. 2012-09-19 17:27:42 +00:00
jtrobinson
64b83c4388 Pushing poll accessibility for visibility's sake; still lots of bugs 2012-09-17 19:08:33 +00:00
Felipe Cecagno
ef3a22f8d9 still working to make the total bandwidth consistent 2012-09-14 17:42:35 -03:00
Felipe Cecagno
625b12795e Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into camera-usability-improvement 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
 2012-09-14 17:14:28 -03:00
Felipe Cecagno
3edc30047f reverting some unwanted modifications 2012-09-14 17:10:34 -03:00
Hugo Lazzari
3abdb7aec6 Adding new headset button. Fixed bug when closing deskshare. 2012-09-14 17:02:13 -03:00
Richard Alam
1240723b99 - forgot to add /fcs/ handler 2012-09-14 19:32:50 +00:00
Felipe Cecagno
0d84b67698 fixing the bigbluebutton preloader to better fit the text "Downloading BigBlueButton..." 2012-09-14 14:38:33 -03:00
Felipe Cecagno
88f138e05c the very first version of the network streams monitor 2012-09-14 14:35:43 -03:00
Richard Alam
7aef1052f3 - call netstream.close() to stop the stream. Calling netstream.play(false) makes red5 look for a file to stream 2012-09-14 15:13:58 +00:00
Prav-Hugo
70e1715d62 BugFix: toolTip had to be updated to display new message in deskshare icon. 2012-09-14 08:21:45 -03:00
Prav-Hugo
5bf72c0e1d Deskshare new icon 2012-09-13 15:17:57 -03:00
Prav-Hugo
877286a116 Usability Improvement 2012-09-13 15:14:39 -03:00
Prav-Hugo
f7b9534974 UI Improvement. 2012-09-13 15:12:25 -03:00
Richard Alam
58d3c90db1 - fix hardcoded locale location 2012-09-12 20:26:37 +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
8ac96a7a3c - change config.xml template to have full URL of SWF files 2012-09-12 15:33:03 +00:00
Richard Alam
781a03a149 Merge branch 'master' into merge-master-into-embedding-client 2012-09-12 15:19:30 +00:00
Richard Alam
75e8542491 - check if mouse cursor is outside presentation window 2012-09-12 06:30:25 +00:00
Richard Alam
886f62337b - qeury for server name so we can determine where to load locales.xml, config.xml, etc. 2012-09-11 21:51:27 +00:00
Richard Alam
17dc1fbde4 - cut down amount of whiteboard data by 2/3 2012-09-11 19:29:26 +00:00
Richard Alam
a9f1a1bb12 - increase timer timeout as it obstructs clicking other buttons 2012-09-11 19:08:04 +00:00
Richard Alam
705ac86d2b - throttle mouse cursor updates in presentation window 2012-09-11 17:50:16 +00:00
Chad Pilkey
969824d29b Merge remote branch 'upstream/master' 2012-09-07 18:11:18 +00:00
Richard Alam
24b5d77de3 - align whiteboard icons 2012-09-07 14:29:22 +00:00
Chad Pilkey
008b3ccf35 Merge remote branch 'upstream/master' 2012-09-06 15:37:12 +00:00
Prav-Hugo
236fe66019 The label of the button didn't change when you were streaming video. Now the label is right and you can stop sharing video clicking on the button. 2012-09-05 15:02:29 -03:00
Prav-Hugo
82914d2611 Resolved Bug #390 
There are many usability issues regarded to the button to join the audio conference. The label of the button is wrong when the user is already in the audio conference, and the icon is very confusing.
Now, the label and icon is right.
 2012-09-05 14:55:47 -03:00
Richard Alam
957948ae79 - fix stream names for video 2012-09-04 22:11:31 +00:00
Chad Pilkey
35704cbdb9 Merge remote branch 'upstream/master' 2012-09-03 23:46:13 +00:00
Markos Calderon
60854bc7fa added a temporary change for text tool in presentation 2012-08-29 16:35:16 -05:00
Fred Dixon
5feed6046f Applied Taigo's update for issue #1246 2012-08-29 14:45:37 -04:00
Gustavo Salazar
e404da9614 Disable h264 by default. 2012-08-27 18:08:29 -05:00
Richard Alam
0971eb9a58 - add example wrapper for loading flash client from different server 2012-08-24 21:32:17 +00:00
Richard Alam
75bd9a754f Merge branch 'master' into embedding-the-client 
Conflicts:
	bigbluebutton-client/resources/prod/BigBlueButton.html
 2012-08-24 21:25:21 +00:00
Richard Alam
72d97f9faf - load flash from an html on a different server 2012-08-24 19:22:26 +00:00
Fred Dixon
a253171ac8 Fix for issue http://code.google.com/p/bigbluebutton/issues/detail?id=1294 2012-08-24 13:43:01 -04:00
Richard Alam
414d3568f6 - see if we can callback from flash to javascript 2012-08-24 15:06:18 +00:00
Richard Alam
51e7b4a114 - remove typo 2012-08-24 14:45:54 +00:00
Richard Alam
8012c8f48f Merge branch 'master' into embedding-the-client 2012-08-24 14:09:32 +00:00
Richard Alam
809e16cc61 - fix tooltip 2012-08-23 22:00:20 +00:00
Richard Alam
ebf89cb65f Merge branch 'use-generated-userid' into merge-master-with-use-generated-userid 2012-08-23 21:31:30 +00:00
Richard Alam
62b92a825c - fix font size for late joiner 2012-08-23 21:29:54 +00:00
jtrobinson
2e2414c16e Selecting 'create new poll' automatically focuses on the first text input of the poll creation menu 2012-08-23 21:16:30 +00:00
Richard Alam
17734c404b - size the fonts properly...but problem with late joiner still 2012-08-23 21:12:46 +00:00
Richard Alam
aba57f70bd - fix assigning of presenter 2012-08-23 19:56:57 +00:00
Richard Alam
d9e5c80c6c - try generating userid instead of using red5 connection id as userid 2012-08-23 19:49:31 +00:00
Richard Alam
5895bbc8c6 - try to fix font size for late joiner 2012-08-23 17:40:39 +00:00
Richard Alam
6f7ba912e6 - cleanup 2012-08-23 13:33:39 +00:00
Richard Alam
da8d48b909 - prototype js to as3 hook 2012-08-22 21:28:03 +00:00
Richard Alam
c90ae01f09 - take layout.xml from resources dir 2012-08-22 21:27:27 +00:00
jtrobinson
50a2e83153 Fixed permission issue 2012-08-22 16:23:18 +00:00
tdj-br
3a0552a2b6 Changed the template of config file. 2012-08-22 10:18:40 +00:00
imdt
472a6f325e Created timeout on RTMP/RTMPT tests. 2012-08-22 10:04:48 +00:00
Richard Alam
67f316b525 - cleanup 2012-08-21 20:46:23 +00:00
jtrobinson
dde07263af Syncing repo before branching 2012-08-21 20:14:53 +00:00
Richard Alam
888e3d9a2f - cleanup 2012-08-21 20:07:17 +00:00
Richard Alam
9749a80026 - fix annotation history when user joins late 2012-08-21 19:42:53 +00:00
jtrobinson
27475a80e4 Trying to sort out focus issues when application starts. 2012-08-21 17:48:20 +00:00
Richard Alam
44b2e55d52 - try and fix synching of annotations for late joiners 2012-08-21 16:00:41 +00:00
jtrobinson
7f53baa363 Ctrl-Shift-? opens glossary window (or closes it if already open) 2012-08-20 21:11:19 +00:00
Richard Alam
ace0e438f9 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-08-20 20:25:31 +00:00
Richard Alam
0dacb217b0 - fix exception popup on Flash debug 2012-08-20 20:25:06 +00:00
Fred Dixon
fef6d0e2b1 Remove reference to Melomel 2012-08-20 16:16:48 -04:00
Chad Pilkey
9b2a9bca46 changed shortcuthelpwindow auto focus to the datagrid 2012-08-20 17:08:18 +00:00
Richard Alam
edf56cacb3 - minimize logging 2012-08-20 15:54:37 +00:00
Richard Alam
d248cb0f8c - fix some exception popups when running flash debugger 2012-08-20 15:19:19 +00:00
Chad Pilkey
9af1bebfbe Merge remote branch 'upstream/master' 2012-08-20 14:49:49 +00:00
Richard Alam
c07eeea844 - use SVC2 codec for deskshare... 2012-08-20 14:32:19 +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