Commit Graph

2368 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Richard Alam
24b5d77de3 - align whiteboard icons 2012-09-07 14:29:22 +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
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
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
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
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
Richard Alam
44b2e55d52 - try and fix synching of annotations for late joiners 2012-08-21 16:00:41 +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
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
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
Richard Alam
b2b3ac89be - update deskshare applet wiht improvements from XOP 2012-08-17 17:48:35 +00:00
Richard Alam
33fcacb00b - remove Ctrl-Z duplicate for whiteboard undo
- add presentation control key binding
2012-08-16 19:21:53 +00:00
Richard Alam
a61dba143f Merge remote branch 'chad/master' into making-bbb-accessible
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
2012-08-16 15:34:07 +00:00
Richard Alam
4abfe5f56d - handle shift-key to move slides forward and backward 2012-08-16 15:19:28 +00:00
jtrobinson
b56be1d87d Small fix 2012-08-15 19:11:45 +00:00
Chad Pilkey
154c319cbc Merge remote branch 'upstream/master' 2012-08-15 19:09:43 +00:00
jtrobinson
ecc572d67b Minor accessibility changes 2012-08-15 18:50:20 +00:00
Chad Pilkey
07b2147977 fixed special case with char 32 2012-08-15 18:29:02 +00:00
Richard Alam
7bafcab0fa - minor cleanup 2012-08-15 18:02:53 +00:00
Chad Pilkey
c9d1e78593 cleaned up the Shortcut Help Window 2012-08-15 17:58:04 +00:00
Richard Alam
06df24ab9c - display text properly to latecomers 2012-08-15 17:51:13 +00:00
Chad Pilkey
ca54b6b352 Shortcut help window finished 2012-08-14 21:53:09 +00:00
jtrobinson
457675f915 Added locale change listener 2012-08-14 21:50:50 +00:00
jtrobinson
c904476eb9 Fixed typo in locale 2012-08-14 20:44:43 +00:00
jtrobinson
f0fdc04c93 Re-added 'go to latest read message' key 2012-08-14 20:43:51 +00:00
jtrobinson
9af930fd5c After restructuring of logic, chat accessibility is back to normal 2012-08-14 20:05:59 +00:00
jtrobinson
866e4a5083 Sync 2012-08-14 19:09:11 +00:00
Richard Alam
bc6d29fff9 - query fro annotation history when loading the page not when the canvas is initialized 2012-08-14 18:51:26 +00:00
Chad Pilkey
5f3a66c043 initial shortcut key window 2012-08-14 18:51:12 +00:00
jtrobinson
124f088d5f Chat navigation logic is wonky after re-structuring, but it builds 2012-08-14 17:59:42 +00:00
Richard Alam
20864b8a8d - handle where presenter creates a new text annotation without commiting the previous text annotation 2012-08-14 17:47:04 +00:00
jtrobinson
414824fbbc Pushing in case of power failure 2012-08-14 16:05:26 +00:00
Richard Alam
b81880c7a3 - draw rectangle while presenter drags mouse for text tool 2012-08-14 15:38:40 +00:00
Richard Alam
fe213ddc0f - send undo when presenter hits Ctrl-Z 2012-08-14 14:55:53 +00:00
Chad Pilkey
72cb09d67d change hotkeys to localized version 2012-08-14 14:36:31 +00:00
jtrobinson
03b58c1221 Minor tweaks to Shortcut Glossary and english locale 2012-08-13 21:43:29 +00:00
Richard Alam
95ef07994b - cleanup and add some notes on how text annotation works 2012-08-13 20:46:09 +00:00
jtrobinson
88676b51e9 Localized chat accessibility methods; started on shortcut help window 2012-08-13 20:37:28 +00:00
Richard Alam
4479c4b925 - maintain focus on text box while being edited, changed size, and color 2012-08-13 20:08:33 +00:00
jtrobinson
41304aea43 Synchronizing repo 2012-08-13 19:17:57 +00:00
Richard Alam
f11231fd3e - cleanup 2012-08-13 18:10:33 +00:00
Richard Alam
58a301cac7 - try to fix focus for text 2012-08-13 16:58:07 +00:00
Richard Alam
b2b2070a77 - fix pan and zoom 2012-08-13 15:03:06 +00:00
Richard Alam
8340d02325 - fix clear and undo 2012-08-13 14:41:38 +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
jtrobinson
8c6de25d40 JAWS/IE and NVDA/Firefox combinations now use ARIA alerts to deliver audio chat notifications. Nothing cooperates with Chrome. 2012-08-09 20:10:46 +00:00
jtrobinson
082e57c565 Trying to back up Chat Module changes 2012-08-09 18:14:20 +00:00
Chad Pilkey
cfd3446123 Merge remote branch 'upstream/master'
Conflicts:
	README
	bigbluebutton-client/.gitignore
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
2012-08-07 19:56:23 +00:00
Richard Alam
3343ab1f0e - change text color and size 2012-08-07 18:26:06 +00:00
Richard Alam
5d999457a6 - fix textbox size for viewers 2012-08-07 16:16:18 +00:00
Felipe Cecagno
2076a1137d fixing the NPE on the layout module when the user joins a conference with an adobe flash player debugger version
http://code.google.com/p/bigbluebutton/issues/detail?id=1261
2012-08-06 13:51:30 -03:00
Richard Alam
d6ab348aff - add sample embed html 2012-08-05 22:14:01 +00:00
Richard Alam
76f94df0a1 - creating JS hooks 2012-08-21 22:02:24 +00:00
Richard Alam
feda651446 - start adding way to call javascript from flash client 2012-08-21 21:59:18 +00:00
Richard Alam
b38a1b3a7c - start adding client apis 2012-08-21 21:48:05 +00:00
Richard Alam
d4691ddc9f - cleanup 2012-08-05 08:15:21 +00:00
Richard Alam
74ad60fe68 - draw line and triangle 2012-08-05 07:30:46 +00:00
Richard Alam
638ae8d0d4 - draw line and triangle 2012-08-05 07:27:03 +00:00
Richard Alam
af15be0f4a - draw circle when ctrl key is pressed 2012-08-05 06:45:40 +00:00
Richard Alam
fbfc49fd5d - draw square when control key is pressed 2012-08-05 06:34:40 +00:00
Richard Alam
f0aba5e593 - text displays again 2012-08-04 23:36:27 +00:00
Richard Alam
3ed5651a98 - can't seem to display text properly...need to fix 2012-08-10 22:17:42 +00:00
Richard Alam
ba6e43484b - pencil works 2012-08-10 19:29:14 +00:00
Richard Alam
a98da69b2b - separate sending and displaying 2012-08-10 19:10:53 +00:00
Richard Alam
41e2f1cc0d - handle Ctrl-KEY 2012-08-10 15:59:12 +00:00
Richard Alam
3482190b18 - minor cleanup 2012-08-10 15:53:40 +00:00
jtrobinson
ce164b48f3 fixeFixed timing of audio alerts. 2012-08-03 20:21:49 +00:00
Richard Alam
0f6c6e8e4d - add background and remove intial text 2012-08-03 19:36:17 +00:00
Richard Alam
e95e4c72f0 - figure out why we dispatch a text created event when mouse moves out of canvas 2012-08-03 19:04:15 +00:00
jtrobinson
d12e176c42 Audio notifications for public and private chat messages; timing is still off 2012-08-03 17:53:02 +00:00
Markos Calderon
9b4a1b4815 Merge pull request #54 from bigbluebutton/fix-chat-url
Fix for event urls and support for https
2012-08-02 13:16:00 -07:00
Markos Calderon
2e8715988b Fix for event urls and support for https 2012-08-01 18:55:50 -05:00
Gustavo Salazar
75e9b45db5 Set type to variable "filter" 2012-08-01 17:00:29 -05:00
Richard Alam
c01b111c3c - try to fix textbox resizing 2012-07-31 20:03:16 +00:00
Richard Alam
69c765cb6d - try crating textbox for whiteborad 2012-07-31 19:42:19 +00:00
jtrobinson
ee0baad670 Hotkeys added for focusing to chat tabs, and for moving backward and forward through tabs 2012-07-31 18:55:59 +00:00
Richard Alam
c97f806154 - comment out some logs to test if we loose some lines when drawing rapidly 2012-07-31 17:19:51 +00:00
Richard Alam
3609d409df - query for annotations when loading new page 2012-07-31 17:09:20 +00:00
Richard Alam
8d931eb94a - setup toolbar properly when switching presenter 2012-07-31 15:49:10 +00:00
Richard Alam
3fb8c458e1 - fix buttons 2012-07-31 15:00:06 +00:00
Richard Alam
0f591f9d34 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-07-30 22:00:00 +00:00
Gustavo Salazar
6c3f430e88 Ask if h264 enabled. 2012-08-01 14:32:42 -05:00
Gustavo Salazar
7735ff6d62 build client for Flash Player 11 2012-07-31 17:49:09 -05:00
Richard Alam
578ef05915 - An example how to display textbox 2012-07-30 21:59:32 +00:00
Chad Pilkey
d6931fb0a8 fixed layout module startup error 2012-07-30 18:24:59 +00:00
jtrobinson
72a40ee66a Timed notifications are working as intended. Next step: Add audio alert to notifications 2012-07-30 16:14:07 +00:00
jtrobinson
687f5e2828 Fixed bug of private message tabs not appearing; timed notifications still in progress 2012-07-30 15:26:41 +00:00
Richard Alam
bdc83d7fdf - separate whiteboard buttons 2012-07-30 04:36:45 +00:00
Richard Alam
b34029140f - extract out each button to maintain easily 2012-07-30 02:57:42 +00:00
Richard Alam
a26962bf66 - don't listen for 'w' and 'd' key chars to enable/disable whiteboard as it consumes text types into text field 2012-07-30 19:16:45 +00:00
Richard Alam
881c0c573f - increase size of text field so that text doesn't get chooped when zooming 2012-07-30 19:16:12 +00:00
Richard Alam
87e989f34a - fix problem where we don't handle properly if there is only 1 annotation 2012-07-30 18:57:02 +00:00
Richard Alam
ab92441af0 - when zooming/panning text, position the text toolbar properly 2012-07-30 18:28:22 +00:00
Richard Alam
06a7759a91 - remove scrollbars on presentation window 2012-07-30 15:43:49 +00:00
Richard Alam
b7a92c8ff2 remove unneeded file 2012-07-30 14:05:36 +00:00
Richard Alam
334b29ed78 - make switching presentation and page work 2012-07-30 13:46:54 +00:00
Richard Alam
251486a62d - query and display annotation history 2012-07-30 13:32:07 +00:00
Richard Alam
f518a41d22 - query for annotation history 2012-07-30 12:24:14 +00:00
Richard Alam
9f335b3ba5 - make undo and clear annotations work 2012-07-30 12:03:18 +00:00
Richard Alam
f1bc5c7e75 - figure out undo 2012-07-29 18:39:42 +00:00
Richard Alam
bf76d21e34 - rename var to make it clear 2012-07-29 17:47:40 +00:00
Richard Alam
58e4539471 - make text resize properly 2012-07-29 17:33:36 +00:00
Richard Alam
cbe0ee60cc - merge some new stuff
Conflicts:
	bigbluebutton-web/.gitignore
2012-07-29 16:06:39 +00:00
Richard Alam
d01615ccee - need to fix zooming of text 2012-07-27 22:01:25 +00:00
Richard Alam
da3086b4b3 - handle start and update of whiteboard shapes properly 2012-07-27 20:25:45 +00:00
Richard Alam
a992d7d547 - setup whiteboard model so that display will query it during redraws 2012-07-27 18:23:43 +00:00
Richard Alam
aa5e695a6e - display text 2012-07-27 16:27:43 +00:00
jtrobinson
30339d150a Added notification timer to chat module; still needs tweaking, but the basics are there 2012-07-27 16:16:46 +00:00
Richard Alam
130813d807 - fix calculation of points 2012-07-27 14:20:38 +00:00
Richard Alam
8b552bd78c - figure out why it's not calculating properly 2012-07-26 22:16:28 +00:00
Richard Alam
b7a942cd91 - try to separate code into it's own classes 2012-07-26 21:08:06 +00:00
jtrobinson
324e100d32 Added framework for audio notification when public/private messages are received 2012-07-26 20:15:33 +00:00
Richard Alam
7c6921e37f - continue refactoring 2012-07-25 21:14:50 +00:00
Chad Pilkey
b0e8bb7900 Merge branch 'master' of github.com:capilkey/bigbluebutton 2012-07-25 19:06:26 +00:00
jtrobinson
b85bd182f5 Fixed repetition bug in Chat Module; screen reading now works. 2012-07-25 19:02:52 +00:00
Richard Alam
c0b7bf3a06 - display text properly when pan/zoom 2012-07-25 18:56:45 +00:00
Chad Pilkey
5006abeba2 Merge remote branch 'upstream/master' 2012-07-25 18:46:49 +00:00
Fred Dixon
091a6855a8 Updated build.xml for client to copy layout.xml to /conf/layout.xml directory 2012-07-25 14:40:33 -04:00
Richard Alam
513759c2f5 - put text in correct position 2012-07-25 18:06:21 +00:00
Richard Alam
2fba336560 - some cleanup for now 2012-07-25 15:58:34 +00:00
Richard Alam
326ab5d7be - still trying to figure out how to display the text properly 2012-07-24 21:58:46 +00:00
jtrobinson
6b33f74a12 Trying to fix chat-to-speech bug, not exactly going well 2012-07-24 20:39:08 +00:00
Chad Pilkey
17acf9c6df hooked up presentation text 2012-07-24 20:36:29 +00:00
Richard Alam
3cf19d6616 - try to fix zooming of text 2012-07-24 20:27:19 +00:00
Richard Alam
66cc2e26e5 store annotations so latecomers can query them 2012-07-24 17:58:00 +00:00
Chad Pilkey
aa31b7f059 Merge remote branch 'upstream/master' 2012-07-24 16:16:04 +00:00
Markos Calderon
b86f9a35e2 Merge branch 'adding-accessibility-changes' 2012-07-23 15:30:25 -07:00
Richard Alam
ef5cef9a1c - manage presenter 2012-07-23 22:12:38 +00:00
Chad Pilkey
571c6f7f0a cleaning up client error files 2012-07-23 21:50:49 +00:00
Chad Pilkey
788d0fc436 Merge branch 'master' of github.com:capilkey/bigbluebutton 2012-07-23 21:48:10 +00:00
Chad Pilkey
37090f6d15 pressing escape with mic setting open now closes window 2012-07-23 21:47:47 +00:00
Richard Alam
c2aef8e94d - figure out how to setup listeners 2012-07-23 21:22:05 +00:00
Richard Alam
31043bc15d - add different shapes 2012-07-23 19:16:55 +00:00
Richard Alam
c1094bf171 - display text 2012-07-23 19:09:33 +00:00
Richard Alam
068d2b0fc9 - fix storing annotations into page 2012-07-23 18:33:47 +00:00
jtrobinson
b55f1e1e65 Hotkey navigation of chat history improved, but not perfected 2012-07-23 14:53:17 +00:00
jtrobinson
6ef05eeb60 Merge branch 'master' of github.com:capilkey/bigbluebutton 2012-07-23 14:50:06 +00:00
bikramac
0d9c6842d2 Update bigbluebutton-client/locale/ne_NE/bbbResources.properties 2012-07-23 04:24:58 -07:00
Chad Pilkey
2ca52ac6e4 new flexlib, fixed FF Flash focus issue 2012-07-20 15:55:26 +00:00
jtrobinson
7ca86db7dc Expanded on chat navigation keys 2012-07-18 20:44:20 +00:00
Richard Alam
7c8aa4a671 - move things around 2012-07-18 17:41:42 +00:00
Richard Alam
5de4cb976c - handle change presentation 2012-07-18 00:30:44 +00:00
Markos Calderon
3c7419c5ef load textfile from the client 2012-07-17 16:39:32 -07:00
Richard Alam
309e7f32c3 - send and receive whiteboard messages 2012-07-17 22:48:51 +00:00
Chad Pilkey
2de63b6627 added tooltip to window title overlay and made it focusable 2012-07-17 21:43:18 +00:00
Chad Pilkey
e5911bbe1d removing log file from client 2012-07-17 20:30:01 +00:00
Chad Pilkey
d6fe15ad95 fixed the resize issues caused when trying to maximize a window 2012-07-17 20:28:27 +00:00
Richard Alam
17121a337a handle messages from server 2012-07-17 20:17:42 +00:00
jtrobinson
17aa0c1ad8 Added updating tooltip and chat history navigation to Chat Module; keybind is temporary 2012-07-17 19:35:05 +00:00
Chad Pilkey
87fd93858e added window resize on ctrl-arrowkey and move on shift-arrowkey 2012-07-17 19:15:39 +00:00
Richard Alam
93fe4dc478 - move things around 2012-07-17 16:57:01 +00:00
Chad Pilkey
1c09d6233c Disabled key binds for presentation window 2012-07-17 15:02:58 +00:00
Richard Alam
26077b8499 - make dependency injection work 2012-07-17 14:48:33 +00:00
Richard Alam
94140b6cef - WhiteboardModel.as is not being inited by the map. Investigating why. 2012-07-16 22:24:28 +00:00
Chad Pilkey
697fe1c6c4 The slide is focusable and ctrl+shift+s focuses it 2012-07-16 21:08:02 +00:00
Ralf Sippl
68bf9f027b added SVC2 (Screen Video V2) support to deskshare 2012-07-16 23:01:49 +02:00
Richard Alam
47b882c917 - slowly making it work 2012-07-16 20:16:28 +00:00
Richard Alam
2d202a0c4a - cleanup 2012-07-16 19:52:26 +00:00
Richard Alam
a8e80c3a9c - make it compile 2012-07-16 19:03:12 +00:00
Chad Pilkey
b732b427f4 using chat box short key now brings the chat window to the front 2012-07-16 18:37:17 +00:00
Richard Alam
5742f2764a Merge remote branch 'ajay/bbb-whiteboard-additions' into merge-whiteboard-features
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/AddShapeWhiteboardRecordEvent.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/WhiteboardEventRecorder.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/IWhiteboardRoomListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/Page.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/ShapeGraphic.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardRoom.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardService.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/common/assets/images/text_icon.png
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/WhiteboardCanvasModel.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/DrawProxy.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/DrawObject.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/DrawObjectFactory.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Ellipse.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Pencil.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Rectangle.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/ShapeFactory.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/managers/PageManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/managers/WhiteboardManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/maps/WhiteboardCanvasEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
2012-07-16 18:08:21 +00:00
Ajay Gopinath
27b2e5ad10 Finalized licenses and deleted random backup files and cleaned up repo. 2012-07-15 14:49:42 -04:00
Ajay Gopinath
89c8e75a2f Fixed TextToolbar's 'text size' menu not closing when focus is changed. 2012-07-15 13:54:41 -04:00
Ajay Gopinath
73ad0281c7 Fixed problem of TextToolbar disappearing when text loses focus. 2012-07-15 13:15:54 -04:00
Ajay Gopinath
70f003b249 Fixed problem of glitchy text when changing pages. 2012-07-15 05:13:09 -04:00
Ajay Gopinath
16a4c2ded3 Fixed issue of zooming without TextToolbar. Fixed flicker with TextToolbar when changing values. 2012-07-15 03:37:46 -04:00
Ajay Gopinath
9544daa34d Backing up before reverting to attempt to fix really dumb problem. 2012-07-14 23:55:01 -04:00
Ajay Gopinath
ddf0cf8df4 Commented most of the new code. Need to fix grid not appearing, shapes being received oddly, and zooming with text toolbar. 2012-07-14 01:46:41 -04:00
Richard Alam
b2973cb3b1 - start refactoring the client 2012-07-14 02:01:14 +00:00
Richard Alam
5c3e6888f4 - cleanup 2012-07-13 21:34:10 +00:00
Richard Alam
1fab7a430c - send and handle change page 2012-07-13 21:00:02 +00:00
Richard Alam
c89a8a2513 - not used 2012-07-13 20:31:26 +00:00
Richard Alam
b3b74a191b - remove unneeded modules from build 2012-07-13 20:31:02 +00:00
Richard Alam
45faed3019 - broadcast messages to other clients without using shared object 2012-07-13 20:30:32 +00:00
Richard Alam
5b55b6930b - listen for messages from server 2012-07-13 17:26:46 +00:00
Richard Alam
293d0bb9a7 - modify whiteboard server app to be able to store text 2012-07-12 22:02:25 +00:00
Richard Alam
20a0fff6c7 - edit text field 2012-07-12 15:14:29 +00:00
jtrobinson
70be06d019 Replaced Presentation module's SWFLoader with Image in preparation for accessibility 2012-07-11 21:59:22 +00:00
jtrobinson
b0ce93cacf Added Ctrl-Z to undo whiteboard drawing 2012-07-11 19:12:28 +00:00
Richard Alam
5bc47d3344 - can't seem to type/edit the text 2012-07-11 01:38:41 +00:00
Ajay Gopinath
c1f5ff0ae5 Finished graph/grid toggle tool. Two bugs remaining: 1)text and grid are not showing up when new clients join 2) sync text/grid when changing pages within a document. TOBE fixed. 2012-07-10 21:36:21 -04:00
Ajay Gopinath
540ed95984 Fixed shapes not being received bug. Fixed text toolbar not moving with window/whiteboard. Added 'text size' feature to text tool options. 2012-07-10 14:51:53 -04:00
Richard Alam
5bac26a123 - add textbox 2012-07-10 12:23:17 +00:00
Richard Alam
7aa983e069 - add font style, size, color 2012-07-10 10:39:55 +00:00
Ajay Gopinath
715cb602c3 Finished text tool 'options'. 2012-07-09 16:43:03 -04:00
Chad Pilkey
715623c292 added shortcuts for mute self and focus chat input 2012-07-09 19:40:00 +00:00
jtrobinson
9fc87c0031 Adding key-capture basics 2012-07-09 21:42:41 +00:00
Chad Pilkey
eed32ebc3b Allow tabbing through flex app 2012-07-09 11:02:09 +00:00
Ajay Gopinath
c38b719823 FINALLY! FINISHED TEXT TOOL. 2012-07-08 21:12:37 -04:00
Ajay Gopinath
8715327475 Modified record event to include fill color. Need to finish text tool and presentation GUI. 2012-07-08 14:30:46 -04:00
Ajay Gopinath
0ef622f959 Added triangle tool and made fill color selectable rather than making it the same as the line color of the DrawObject. 2012-07-06 22:36:41 -04:00