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

388 Commits

Author SHA1 Message Date
Richard Alam
046e4aa9d8 Merge branch 'master' into upgrading-red5-r4406 2012-09-05 14:43:03 +00:00
Gustavo Salazar
6920db9123 Accept updates when drawing a shape. 2012-09-03 21:10:09 -05:00
Richard Alam
420d5f13dd - try to fix why it's not working properly 2012-09-03 18:39:51 +00:00
Richard Alam
808588cb5d - try upgrading to red5 r4406 2012-09-03 17:15:46 +00:00
Richard Alam
26c4077723 - missed one spot to change the userid 2012-08-24 20:52:51 +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
d9e5c80c6c - try generating userid instead of using red5 connection id as userid 2012-08-23 19:49:31 +00:00
Richard Alam
13261976f9 - fix ClassCastException once more 2012-08-23 15:58:50 +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
cdb81be8d9 - try another way to fix Integer to Double class cast exception 2012-08-20 14:43:48 +00:00
Richard Alam
2563966a7d - cleanup 2012-08-17 15:41:27 +00:00
Richard Alam
f182abf812 - record text annotations properly 2012-08-17 15:40:01 +00:00
Richard Alam
40dbd9bab5 - fix NPE when querying for annotations history 2012-08-17 14:41:42 +00:00
Richard Alam
06df24ab9c - display text properly to latecomers 2012-08-15 17:51:13 +00:00
Richard Alam
5a2e5912d6 - fix ClassCastException when drawing scribble that results in gaps in the whiteboard marks 2012-08-15 17:19:38 +00:00
Richard Alam
fbfc49fd5d - draw square when control key is pressed 2012-08-05 06:34:40 +00:00
Markos Calderon
234078b09e Added username for record in participants module 2012-07-31 15:34:56 -07:00
Richard Alam
35bc56625b - fix undo logic 2012-07-30 18:51:15 +00:00
Richard Alam
da3086b4b3 - handle start and update of whiteboard shapes properly 2012-07-27 20:25:45 +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
Richard Alam
309e7f32c3 - send and receive whiteboard messages 2012-07-17 22:48:51 +00:00
Richard Alam
47b882c917 - slowly making it work 2012-07-16 20:16:28 +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
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
0b78831ffa - add method to delete annotation 2012-07-13 21:53:00 +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
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
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
575ffb45b8 - start modifying server side 2012-07-10 12:23:43 +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
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
Richard Alam
459d486309 Merge remote branch 'origin/add-pointer-record' into add-more-whiteboard-features 2012-07-06 16:00:06 +00:00
Markos Calderon
e378ee146c added changes for record presentation pointer 2012-07-05 14:59:13 -07: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
782154bba9 Finished adding fill selection tool and transparency option tool. 2012-06-30 18:47:31 -04:00
Ajay Gopinath
7ac7a51ebe red5 opened to dev successfully. Start of development of bbb-apps. 2012-06-22 14:41:06 -04:00