BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,715 Commits 13 Branches 260 Tags 1.1 GiB
5727fd9b07
Commit Graph

2047 Commits

Author SHA1 Message Date
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
Richard Alam
59fde6e7ea - add icons to toolbar 2012-07-06 20:54:43 +00:00
Ajay Gopinath
a9fabf0028 Fixed duplication of GraphicObjects glitch when zooming and changing view modes. Added sprite transformation libraries but need to integrate with program. 2012-07-06 15:40:35 -04:00
Markos Calderon
a133a7e1a6 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into add-pointer-record 2012-07-06 11:22:32 -07:00
Richard Alam
e6a7a2b8b1 - add scribble and text icon 2012-07-06 17:42:17 +00:00
Richard Alam
79f313b880 Merge remote branch 'origin/add-pointer-record' into add-more-whiteboard-features 2012-07-06 17:35:23 +00:00
Markos Calderon
3d86d5d2a0 forgot to add service file 2012-07-06 10:02:45 -07:00
Richard Alam
ec9a72b3bb Merge branch 'master' into add-more-whiteboard-features 2012-07-06 15:21:31 +00:00
Richard Alam
1d4ee2862c Merge branch 'layout-module' 2012-07-06 15:03:49 +00:00
Chad Pilkey
4c80b4be34 updated the flexlib library and added tooltips to it 2012-07-06 11:36:14 +00:00
Ajay Gopinath
92343a02e5 Major change. Finished recognition of individual GraphicObjects using Selection Tool. Able to pick out top most GraphicObject when layers are present. Fixed personal license statements. New system exclusively for LTB, may be difficult to merge back with BBB, but will suffice for now. Text still buggy. 2012-07-05 19:09:53 -04:00
Ajay Gopinath
b2e86495c6 Added selection tool and basic recognition of individual objects. Need to fix text tool and allow modification of individual objects. 2012-07-05 16:03:17 -04:00
Felipe Cecagno
cd111f4d09 fixing the issue reported by a community member on this post: https://groups.google.com/forum/#!msg/bigbluebutton-dev/WgqfuXgPolE/YBAqw7kc0PoJ 2012-07-05 14:14:12 -03:00
Ajay Gopinath
e2d536a8f4 Added eraser and highlighter tool. Fixed text normalization issue. Need to add recogniition of individual objects. Text is buggy. 2012-07-05 01:34:51 -04:00
Ajay Gopinath
938103972d Finished basis for text tool. Stil need to add identification for individual objects/add text customization/fix glitches. 2012-07-04 12:28:29 -04:00
jtrobinson
b827e9b76c Undoing test change 2012-07-03 20:16:55 +00:00
jtrobinson
e16bd4981b Testing Eclipse 2012-07-03 20:16:16 +00:00
Ajay Gopinath
50d887e948 Fixed fill/transparency tool glitch of other clients not receiving updated shapes history. Abstracted DrawObject and TextObject to GraphicObject, and ShapeFactory and TextFactory to GraphicFactory. Almost done with abstraction of new functionality. 2012-07-01 15:33:50 -04:00
Ajay Gopinath
782154bba9 Finished adding fill selection tool and transparency option tool. 2012-06-30 18:47:31 -04:00
Ajay Gopinath
1f759c1466 Backup commit before resetting dev env 2012-06-27 18:28:01 -04:00
Felipe Cecagno
67e6c27e43 better vertical alignment of the components on the main toolbar and the bottom toolbar 2012-06-25 14:30:27 -03:00
Felipe Cecagno
64eba0a904 implemented multiple definitions layout, so the admin may define specific layouts depending on the role of the participant (see the layout definition) 2012-06-25 14:05:33 -03:00