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

1921 Commits

Author SHA1 Message Date
Richard Alam
aa5e695a6e - display text 2012-07-27 16:27:43 +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
Richard Alam
7c6921e37f - continue refactoring 2012-07-25 21:14:50 +00:00
Richard Alam
c0b7bf3a06 - display text properly when pan/zoom 2012-07-25 18:56:45 +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
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
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
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
bikramac
0d9c6842d2 Update bigbluebutton-client/locale/ne_NE/bbbResources.properties 2012-07-23 04:24:58 -07: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
Richard Alam
17121a337a handle messages from server 2012-07-17 20:17:42 +00:00
Richard Alam
93fe4dc478 - move things around 2012-07-17 16:57:01 +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
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
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
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
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
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
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
Felipe Cecagno
44afd21339 implemented the windows order on the layout module 2012-06-25 10:40:42 -03:00
Ajay Gopinath
7ac7a51ebe red5 opened to dev successfully. Start of development of bbb-apps. 2012-06-22 14:41:06 -04:00
Ajay Gopinath
bb241409ad Backup before opening red5 up to dev. Still has Line tool. 2012-06-21 23:06:24 -04:00
Ajay Gopinath
59fc817df9 Added a simple line tool to whiteboard. 2012-06-21 19:13:38 -04:00
Ajay Gopinath
21b152f12a Added to bottom copyright, build working fine. 2012-06-21 12:31:12 -04:00
Ajay Gopinath
75e4e8d7bb Changed copyright below to test 2012-06-21 12:02:42 -04:00
Ajay Gopinath
d85a3176da Initial build commit. Revert back to here. No changes applied 2012-06-21 02:29:59 -04:00
Felipe Cecagno
5f2c4fc837 start to develop an order manager, which would keep track of the z-order of the windows in the canvas 2012-06-19 12:27:13 -03:00
Felipe Cecagno
b65ecad3b2 adding the lock button tooltip and fixing an issue related to the attribute "hidden" 2012-06-18 15:18:42 -03:00
Richard Alam
17bba97d40 - add catalan locale 
- update version to 0.8
 2012-06-18 12:56:30 +00:00
Felipe Cecagno
473468c4ac locking the participant windows when the session layout are locked 2012-06-15 17:31:22 -03:00
Felipe Cecagno
cb96e55137 making components consistent with the user's role: if the user is a participant, he won't see the control buttons (add, save, load), the lock button will be always disabled and the layouts combo will be enable only when the layouts aren't locked 2012-06-15 15:47:55 -03:00
Felipe Cecagno
85aa046010 added an attribute to the layout module to show or hide the module control buttons (add, save and load) 2012-06-15 14:43:18 -03:00
Felipe Cecagno
ba61055121 implement a mechanism to hide a window through the layouts definiton file 2012-06-15 14:39:21 -03:00
Felipe Cecagno
e2d99acbb0 it still needs some refactoring, but it's working fine; this is the client side of the layout module which interacts with the server in order to (un)lock the windows layout 2012-06-15 11:45:14 -03:00
Richard Alam
3d33d26bae - update latvian and german locales 2012-06-13 17:17:00 +00:00
Richard Alam
174a1c643e Merge pull request #40 from cforce/master 
added missing german locale strings
 2012-06-12 13:07:29 -07:00
Richard Alam
e411d3271b Merge pull request #42 from amon-sha/fix_lv_locale 
Fix Latvian language file
 2012-06-12 13:04:28 -07:00
Richard Alam
de6e0857a2 - update spanish and basque locales 2012-06-11 21:37:39 +00:00
Felipe Cecagno
a5c303772f leaving a little more space to the bottom controlbar 2012-06-06 17:52:46 -03:00
Felipe Cecagno
04ab5a3fe8 final version of the layout module before start to implement the mechanism to lock the windows layout 2012-06-06 14:53:53 -03:00
Richard Alam
d4b1c41298 - updating deskshare applet filename to 0.8 2012-06-05 21:09:37 +00:00
Richard Alam
d116e4f298 - update locale 2012-06-03 15:12:16 +00:00
Amon Sha
0294fa8ab0 Fix Latvian language file 2012-06-02 17:49:20 +03:00
Felipe Cecagno
782ad74fb2 created buttons to add the current layout, save/load layouts to/from file 2012-06-01 17:41:53 -03:00
Felipe Cecagno
1c59664ebe first version with save and load working fine 2012-05-30 17:36:11 -03:00