Commit Graph

410 Commits

Author SHA1 Message Date
Markos Calderon
c9976e048e storing pencil shape 2012-11-15 10:52:04 -05:00
Markos Calderon
4d76c61417 added a better quality for converting images 2012-10-24 14:37:25 -05:00
Markos Calderon
faeac6a6e1 move and back slides 2012-10-23 13:32:59 -05:00
Markos Calderon
ef5689b73b added whiteboard pencil pending store the shape 2012-10-05 18:22:18 -05:00
Markos Calderon
48c0830efc setpresenter, mouse movement, and starting to send pencil drawings 2012-10-05 17:07:17 -05:00
Markos Calderon
9352e198ef setPresenter integrated 2012-09-25 18:29:58 -05:00
Markos Calderon
23a03c21e7 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into html5-bridge 2012-09-24 14:27:31 -05:00
Richard Alam
2b71f9f964 - fix history for latecomers 2012-09-21 20:44:15 +00:00
Markos Calderon
173211bdec integrating setPresenter call 2012-09-21 14:42:17 -05:00
Markos Calderon
4e57ee7234 added a method for get the userid 2012-09-15 06:48:13 -07:00
Markos Calderon
cd53c08531 messages doesn't load in flex client - fixed 2012-09-15 06:13:01 -07:00
Markos Calderon
89e6b614a2 storing messages 2012-09-15 05:30:20 -07:00
Markos Calderon
baa9eef486 chat almost complete... pending chat history in flex client 2012-09-15 03:15:14 -07:00
Markos Calderon
84127f3d80 Initial Changes for chat module 2012-09-15 02:46:41 -07:00
Markos Calderon
8053c15b9e participants module full working 2012-09-15 01:44:17 -07:00
Markos Calderon
cc970323e1 last fix... 2012-09-15 00:50:57 -07:00
Markos Calderon
eba31e9dbb another fix 2012-09-14 23:40:34 -07:00
Markos Calderon
5fc2b46ce8 fix load participants 2012-09-14 22:09:37 -07:00
Markos Calderon
3994d3b592 fixing... send update list when participant left 2012-09-14 21:42:18 -07:00
Markos Calderon
0a3a33fbf2 Latest changes in integrating participants module 2012-09-14 21:18:29 -07:00
Markos Calderon
ce9d7c1706 API stores meeting in redis, apps stores users in redis 2012-09-14 16:48:05 -07:00
Richard Alam
ad35b2ab08 - upgrade to red5 r4415 2012-09-12 20:39:34 +00:00
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