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

430 Commits

Author SHA1 Message Date
jtrobinson
50a2e83153 Fixed permission issue 2012-08-22 16:23:18 +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
Felipe Cecagno
ded77508fe first version of the server side layout module - it allows users to lock and unlock the current layout; the layout is defined as a String, which should be a XML String but may be anything, this way is much easy to extend the layout management, since it won't need to change the server code 2012-06-15 11:34:57 -03:00
Richard Alam
b5b6d5f954 - update red5 to latest (r4316) 2012-04-22 15:03:43 +00:00
Richard Alam
17b3922295 - don't use map to determine ESL message 2012-04-12 16:31:34 +00:00
Richard Alam
835670f592 - retry indefinitely to connect to FreeSWITCH ESL 2012-03-27 15:24:50 +00:00
Richard Alam
c23b3be31a - fix cast exception on file upload 
- fix "undefined" on fileupload window
 2012-02-24 20:19:37 +00:00
Richard Alam
5abe4eecb4 - remove w,h,x,y from message as we don't use them 2012-02-21 19:42:39 +00:00
Richard Alam
4740d1c10a - add more parameters on message from presenter to viewer 2012-02-16 18:52:39 +00:00
Richard Alam
e79a650a05 - remove optimization for pencil tool 2012-02-15 22:48:42 +00:00
Markos Calderon
83ebc7a24e changes in latentFeedback and added a check size in bbb-apps 2012-01-23 13:06:58 -08:00
Richard Alam
ecc979e274 - generate internal userid to be able to match users across subsytems 2012-01-18 15:46:29 +00:00
Markos Calderon
e7b839614f Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-01-09 14:45:08 -08:00
Markos Calderon
ea5331d0c9 now, bbb-web uses the internalUserId 2012-01-09 14:44:14 -08:00
Richard Alam
6b24878a5c - fail fast when cannot connect to FS-ESL on startup 2012-01-09 21:40:46 +00:00
Richard Alam
c858a6919b - try to connect to FS-ESL when the connection has dropped. 2012-01-09 19:16:34 +00:00
Markos Calderon
66831d0808 Merge branch 'updating-jedis-config' 2011-12-14 14:18:56 -08:00
Markos Calderon
f889d23fc0 fix for userid mismatch in API 2011-12-13 14:44:17 -08:00
Markos Calderon
e84a27c51c added config file for jedispool 2011-12-12 15:18:52 -08:00
Richard Alam
0bbe44e785 move assign presenter logic to users/participants. This fixes a race condition where the first moderator 
doesn't become presenter by default.
 2011-12-08 21:43:16 +00:00
Richard Alam
aa923319a7 Merge branch 'master' into refactor-chat-client 2011-11-22 15:36:25 +00:00
Markos Calderon
ec94029de2 added comments for the ChatObject class 2011-11-21 09:13:48 -08:00
Markos Calderon
5e102ceb1b sending a chatobject class to the server 2011-11-21 08:50:45 -08:00
Richard Alam
6e6cb5527e - upgrade fs-esl lib 2011-11-19 18:44:41 +00:00
Richard Alam
97b4a3e38a - change jars that we need to package with red5 2011-11-19 17:38:04 +00:00
Markos Calderon
33dcf0e2b3 fixed send private message 2011-11-18 17:46:56 -08:00
Markos Calderon
57677bf239 fixed problem with pipe, however need some cleanup 2011-11-18 16:42:25 -08:00
Markos Calderon
ac6073527c initial changes 2011-11-18 12:06:35 -08:00
Richard Alam
5ea0e41b2d upgrading to fixed red.jar for rtmpt 2011-11-16 21:28:09 +00:00
Richard Alam
ba8bc03ef7 - re-add aop jars as it's needed for JVM shutdown hook...but needs to be in red5/lib dir 2011-11-04 14:44:33 +00:00
Richard Alam
f8adf89d9a remove aop jars 2011-11-04 12:55:55 +00:00
Richard Alam
bb86f44150 - compile with red5-r4293 
- still some errors to resolve
   - had to add aop jars in bbb-apps
   - deskshare is choking on tunneling
   - exceptions when starting red5 manually
 2011-11-04 02:07:35 +00:00
Richard Alam
c75c132925 build bbb-apps with red5 r4293 2011-11-03 20:23:55 +00:00
Richard Alam
968a5d7967 Merge branch 'master' into testing-with-red5-trunk 
Conflicts:
	bigbluebutton-apps/build.gradle
 2011-10-27 10:58:53 -04:00
Markos Calderon
0d7924d650 changes in log files 2011-10-26 12:02:41 -07:00
Richard Alam
2564314aac check if shared object is null as user may have left and will result an NPE when sending private chat 2011-10-25 10:34:46 -04:00
Richard Alam
d7b665f463 add some debug logging on why the client doesn't get updated after some time. This happens 
on demo after a few days but difficult to reproduce locally.
 2011-10-24 13:04:44 -04:00
Richard Alam
8ef0d266ed more cleanup 2011-10-19 16:44:28 -04:00
Richard Alam
ea889de5a4 cleanup 2011-10-19 16:42:16 -04:00
Richard Alam
1a9c19e1a6 - up version and remove asterisk-java dependency 2011-10-19 15:38:05 -04:00
Richard Alam
34d6d9cc69 - remove asterisk for cleanup as we only now use FS for 0.8...can add back support in the future 2011-10-19 15:29:55 -04:00
Richard Alam
d9bc91768e completely remove spring integration 2011-10-19 14:58:17 -04:00
Richard Alam
3fa22c6909 - changing build dependencies 2011-10-19 10:34:15 -04:00
Richard Alam
e6606ecc27 - revert back as Red5 is throwing an NPE 2011-10-18 11:46:11 -04:00
Richard Alam
8b42a433c2 fix logging as it was incorrectly logging that it can't find the room 2011-10-03 09:46:35 -07:00
Richard Alam
45e6a473f5 - fix issue where voice bridge is not removed properly when the meeting ends. 2011-10-11 18:50:24 -04:00
Richard Alam
8e98ae63bd show pre-uploaded presentation in drop down 2011-10-03 01:46:37 -04:00
Marco Calderon
c36951dca6 updated messaging module in bbb-apps 2011-09-08 12:11:34 -05:00
Richard Alam
b9e5b69a20 - add messageId to redis pub/sub messages to be able to filter and identify easily 2011-07-20 11:44:11 -04:00
Richard Alam
41269197ca - check it meeting is already being recorded 2011-07-10 10:31:49 -04:00
Richard Alam
8c8e009baa - unit test passing again 2011-06-23 14:04:00 -04:00
Richard Alam
0b6e59e8ab - add duration parameter on creat API. This allows us to set a limit on the meeting length 
to prevent continuously recording a meeting whe someone forgets to logout
 2011-06-21 14:16:37 -04:00
Richard Alam
480489fc7f - change numberOfPages to String so that the message gets forwarded to the client. 
- stopped activeMQ and Mysql and it works...so we've removed dependency to ActiveMQ and MySQL
 2011-06-16 12:48:31 -04:00
Richard Alam
a71b30af9c - cleanup, fix merge issues, connect to redis explicitly when subscribing to a channel 2011-06-16 10:46:59 -04:00
Marco Calderon
d022aafb61 Cleanup bigbluebutton-web and bigbluebutton-apps 2011-06-15 08:30:56 +00:00
Marco Calderon
f1a55ba26b bigbluebutton-apps handles the presentation messages using gson 
TODO: cleanup, logs, and some updates
 2011-06-15 01:42:56 +00:00
Marco Calderon
e858828162 added gson and publish updates in bbb-web, missing receiving code in bbb-apps 2011-06-14 01:43:55 +00:00
Marco Calderon
2ac6aaa09a merge remove-bbb-commons, working prototype, need to add status method to listener 2011-06-09 01:35:24 +00:00
Richard Alam
bc1d9ef562 - add back to groovy jar file back as it broke spring integration 2011-05-31 16:32:23 -04:00
Richard Alam
ad9a4895b8 - cleanup jars 2011-05-28 17:57:09 +00:00