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

689 Commits

Author SHA1 Message Date
Richard Alam
e23bc094c0 - break down spring config into smaller components so it's easier to maintain 2013-06-07 14:58:26 -04:00
Richard Alam
9e2f8a4e5e - slowly restructure apps 2013-06-07 14:32:13 -04:00
Richard Alam
7b9a24c825 - separate send and receiver for redis pubsub 2013-06-07 13:57:18 -04:00
Richard Alam
212a2bd156 - refactor redis messaging 2013-06-07 11:56:01 -04:00
Richard Alam
575025a828 Merge branch 'polling-module' into merge-polling-module 2013-06-07 09:43:39 -04:00
Markos Calderon
8ca16a3953 updating bbb-apps to handle polls 2013-06-06 18:53:57 -05:00
Richard Alam
09a008b601 - setup poll messages 2013-06-06 18:04:26 -04:00
Richard Alam
870b2b97d9 - force hangup of user when he leaves the meeting. When users call in through the phone, they don't get ejected 
from the meeting when they logout.
 2013-05-29 20:37:09 +00:00
Richard Alam
1714fc87ba - setting up polls 2013-05-21 01:25:35 +00:00
Richard Alam
a36b9a6142 - some cleanup 2013-05-21 01:25:06 +00:00
Richard Alam
99ce478dc5 - moving things around 2013-05-20 22:55:21 +00:00
Richard Alam
530aa964c0 - add way for gradle to find java classes used by scala 2013-05-20 04:08:18 +00:00
Richard Alam
5541ada1e4 - start organizing packages 2013-05-20 03:24:25 +00:00
Richard Alam
1fc5454407 - slowly refactor polling application 2013-05-20 01:10:44 +00:00
Richard Alam
95dd42fb12 - modify ESL connect startup so that it will continue to try to register with ESL 2013-05-19 20:46:20 +00:00
Richard Alam
b378cab70a - simplify handling and sending of events 2013-05-19 04:39:41 +00:00
Richard Alam
b953886ac6 - subscribe to events 2013-05-19 03:54:31 +00:00
Richard Alam
6d8971eda8 - monitor connection every second and connect if not connected 2013-05-19 02:11:30 +00:00
Richard Alam
b37261733e - change esl connection 2013-05-19 01:42:45 +00:00
Richard Alam
6e696baba9 - create app and send type 2013-05-18 22:48:02 +00:00
Ubuntu
5c284d7099 Merge branch 'master' into mod-client-communication 2013-05-30 15:41:21 +00:00
Richard Alam
2c21c3e50d - initialize message queue 2013-05-28 19:50:57 +00:00
Richard Alam
a37476267f Merge branch 'master' into mod-client-communication 2013-05-28 19:28:57 +00:00
Richard Alam
2800c4f603 - upgrade to red5 r4643 2013-05-18 21:39:53 +00:00
Richard Alam
564b099917 have the recorder run on it's own executor 2013-05-18 03:24:29 -07:00
Richard Alam
f7baed395a - don't create a per room recorded...will make it easier to change how we process message later on 2013-05-18 02:47:01 -07:00
Richard Alam
7ece7dcb34 - add a way to send message to client using shared object 2013-05-18 00:56:57 -07:00
Richard Alam
f5730f0d18 remove scala dependencis 2013-05-18 00:56:20 -07:00
Richard Alam
42afda8f5c - upgrade to red5 r4641 2013-05-14 18:47:23 +00:00
Richard Alam
67185ee9e5 - upgrade to red5 r4639 2013-05-08 19:16:43 +00:00
Richard Alam
0b902805b0 - seems like it's picking the wrong jar 2013-04-30 15:43:56 +00:00
Richard Alam
75fb9c9a09 - upgrade to red5 r4635 to get fix for RTMPT kepp alive 2013-04-30 15:11:28 +00:00
Richard Alam
607d09e7cb - upgrading to latest red5 with fix to rtmpt 2013-04-28 23:38:54 +00:00
Richard Alam
91176431ca - upgrade to red5 r4360 2013-04-28 20:11:19 +00:00
Richard Alam
dfa65a5d91 - upgrade to red5 r4628 2013-04-27 23:07:28 +00:00
Richard Alam
c06334f24d - upgrade to red5 r4627 2013-04-26 20:59:33 +00:00
Richard Alam
5d3bb5fb70 - remove extra parameters when connecting to bbb-apps 2013-03-22 14:48:20 +00:00
Richard Alam
aebc524125 - Fix NPE when removing voice conference when all users have left 2013-03-22 14:16:31 +00:00
Richard Alam
2074ef0d5e - need to clean up scopes properly and try to minimize dependency on scope lifecycle 2013-03-21 20:00:58 +00:00
Richard Alam
c6ac009b86 Merge branch 'master' into upgrade-to-red5-r4597 2013-03-19 18:28:38 +00:00
Richard Alam
0cb6721147 - upgrade to red5 r4599 2013-03-19 18:27:22 +00:00
Richard Alam
d28a7ecf02 - upgrade to red5 r4597 2013-03-18 18:05:35 +00:00
Markos Calderon
9babc757fc fix close cam if it's not available 2013-03-18 12:58:09 -05:00
Richard Alam
02296cf267 - upgrade to red5 r4592 2013-03-11 15:00:48 +00:00
Richard Alam
ece4ef7f1f - BBB now starts properly on red5 r4582. Need a bit more testing though. 2013-03-08 22:49:11 +00:00
Richard Alam
412f44690b - try making sure that the different components execute the lifecycle properly 2013-03-08 22:21:31 +00:00
Richard Alam
7c4326a22e - make bbb start on red5 r4582 2013-03-08 20:39:37 +00:00
Richard Alam
e6da7afcdd - upgrade to red5 r4582 2013-03-07 19:48:03 +00:00
Richard Alam
63a3420b76 Merge branch 'master' into upgrade-to-red5-r4580 2013-03-07 18:42:25 +00:00
Richard Alam
556131dce5 - eject all users from voice conference when meeting ends 2013-03-07 15:19:16 +00:00
Richard Alam
310c283dd1 - initialize shared objects not on roomstart but on room connect 2013-03-06 15:59:40 +00:00
Richard Alam
3c53ceecec - upgrade to red5 r4581 2013-03-06 15:58:56 +00:00
Richard Alam
601afeaae3 - upgrade red5 to r4580 2013-03-04 18:12:07 +00:00
Richard Alam
eadd1e3ef0 - upgrade builds to red5 r4578 2013-03-03 12:34:25 +00:00
Richard Alam
29864cc734 - create and executor to send messages 2013-02-28 19:08:38 +00:00
Richard Alam
99443dc3cb - removing clientID as we don't use the Red5 connect id anymore 2013-02-28 18:27:41 +00:00
Richard Alam
19d2472fd0 - move logback config into resources dir so we don't need to copy it as last step in gradle war 2013-02-28 01:03:31 +00:00
Richard Alam
e3cbd49bae - minor cleanup 2013-02-28 00:27:10 +00:00
Richard Alam
ed64da0f9b - build bbb-apps on red5 r4573 2013-02-27 23:35:16 +00:00
Richard Alam
cc859b94f8 Merge branch 'master' into upgrade-to-red5-r4573 2013-02-26 14:48:01 +00:00
Richard Alam
5f0b2a7ea7 - change logging history from 30 days to 5 days...don't need that much history 2013-02-26 14:08:12 +00:00
Richard Alam
4838840aa5 - upgrading red5 jar 2013-02-25 20:41:50 +00:00
Richard Alam
93311e6464 Merge branch 'master' into merge-master-into-polling-module 
Conflicts:
	bigbluebutton-client/build.xml
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/src/BigBlueButton.mxml
 2013-02-04 19:34:23 +00:00
Richard Alam
8e2e2c83ca Revert "Modified API to be able to map conferences by their name instead of their voiceBridge number. To preserve backwards compatibility is sufficient to pass the voiceBridge number as the conference name in the API call." 
This reverts commit a7156aa0a6.

Command used: git revert a7156aa0a6

Conflicts:

	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
 2013-02-01 17:53:08 +00:00
Richard Alam
77d8df50da - try to figure out why listener doesn't get displayed 2013-02-01 16:35:23 +00:00
Richard Alam
ea8488af38 Merge branch 'master' into external_freeswitch 2013-01-31 22:10:56 +00:00
Markos Calderon
8a7149b0b2 Added license for bigbluebutton-apps 2013-01-18 17:49:50 -05:00
Richard Alam
cbcd54cd7b - update broadcast module to work on master 2012-12-21 20:34:33 +00:00
Richard Alam
5c8ab54570 - make properties for icecast stream configurable 2012-11-15 18:59:19 +00:00
Richard Alam
b9eae232d3 - external icecast protocol property 2012-11-14 20:40:12 +00:00
alexbbb
e3646bca4a Fix of the previous commit to remove unnecessary System.out.println 2012-11-12 17:04:55 +01:00
alexbbb
a7156aa0a6 Modified API to be able to map conferences by their name instead of their voiceBridge number. To preserve backwards compatibility is sufficient to pass the voiceBridge number as the conference name in the API call. 2012-11-12 16:59:15 +01:00
Richard Alam
e583c3d603 - embed scala lib 2012-10-30 16:27:19 +00:00
Richard Alam
00f4cefca1 - inject conn invoker 2012-10-30 14:08:26 +00:00
Richard Alam
9c57e83796 - try to consolidate apps 2012-10-30 14:08:05 +00:00
Richard Alam
d3f1c22e46 - try to consolidate apps 2012-10-30 14:07:43 +00:00
Chad Pilkey
0c6e5a0632 Merge remote branch 'origin/master' into poll-access 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/core/managers/UserManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	record-and-playback/presentation/playback/presentation/acornmediaplayer/acornmediaplayer.base.css
	record-and-playback/presentation/playback/presentation/acornmediaplayer/jquery.acornmediaplayer.js
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-captions-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-captions.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-exit-fullscreen-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-exit-fullscreen.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-fullscreen-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-fullscreen.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-pause-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-pause.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-play-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-play.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-transcript-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-transcript.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume-full-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume-full.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/acorn.access.css
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/button-background-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/button-background-light.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/controls-background-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/controls-background-light.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/barebones/acorn.barebones.css
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/acorn.darkglass.css
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-caption.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-exit-fullscreen.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-fullscreen.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-pause.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-play.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-transcript.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-volume-full.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-volume.png
	record-and-playback/presentation/playback/presentation/css/bbb.playback.css
	record-and-playback/presentation/playback/presentation/playback.html
 2012-10-29 16:03:09 -04:00
Richard Alam
2d6d1f83c5 - cleanup 2012-10-29 19:52:37 +00:00
Richard Alam
4b2bbb0cf8 - cleanup chat 2012-10-29 19:40:56 +00:00
Richard Alam
87fe30e30b - add hook to send public chat message from JS 2012-10-18 20:17:51 +00:00
Richard Alam
9aa4f274c3 - pass utc time and timezone offset when sending chat message so we can display the send time by converting to local time 2012-10-17 15:41:41 +00:00
Richard Alam
0cfc9fabec - request for chat history when joining the meeting 2012-10-17 14:34:34 +00:00
Richard Alam
314d0edf39 - send message to self when sending private chat 2012-10-16 21:30:49 +00:00
Richard Alam
b4e1bee033 - display private chat message 2012-10-16 18:46:49 +00:00
Richard Alam
a6b4559c34 - display public chat message 2012-10-16 17:40:52 +00:00
Richard Alam
4f2db7678a - send and receive chat messages using conn invoke instead of shared object 2012-10-15 19:43:49 +00:00
Chad Pilkey
172eae1891 Merge remote branch 'origin/master' into poll-access 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
 2012-10-12 15:43:18 +00:00
Richard Alam
ceff2ea131 - start refactoring chat module to have a proper data model so we can expose to JS API 2012-10-11 22:08:18 +00:00
Richard Alam
e860863502 - propagate external user id to clients 2012-10-10 21:38:20 +00:00
Richard Alam
3852a2383b - allow broadcasting even if the meeting isn't being recorded 2012-10-10 21:05:30 +00:00
Richard Alam
d73a92ab6a - provide a way to stream to outcast 2012-10-10 20:52:20 +00:00
Chad Pilkey
dea6a89dd0 Merge remote branch 'origin/master' into poll-access 2012-10-02 14:58:41 +00:00
Markos Calderon
a72f91968b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into change-internaluserid 2012-10-01 16:41:45 -05:00
Markos Calderon
5dafac2b25 change long to string 2012-10-01 16:41:33 -05:00
Richard Alam
5338c823c2 - use connection invoke instead of shared object when sending mouse cursor events in presentation 2012-10-01 15:44:54 +00:00
Chad Pilkey
a7f3e5aec1 fixed polling module to work with new version of red5 2012-09-24 19:36:56 +00:00
Chad Pilkey
1557318b32 Merge remote branch 'origin/master' into poll-access 2012-09-24 19:01:36 +00:00
Chad Pilkey
f9b501f1f0 Merge remote branch 'origin/master' into poll-access 2012-09-24 15:16:02 +00:00
Richard Alam
2b71f9f964 - fix history for latecomers 2012-09-21 20:44:15 +00: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
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
Marco Calderon
5bbb607c5d Added redis pool, pubsub, and maven3 support to bbb-web 2011-05-17 11:04:40 +00:00
Marco Calderon
245070b366 removed bbb-commons. TODO: update process method and endrequest meeting 2011-05-14 05:56:35 +00:00
Marco Calderon
a9fcd56a88 refactoring bbb-apps 2011-05-11 02:09:10 +00:00
Marco Calderon
6681c56575 initial changes in bbb-apps 2011-05-05 09:16:40 +00:00
Richard Alam
1930c76c73 - upgrade dependency to red5-1.0rc1 2011-05-03 17:45:42 -04:00
Richard Alam
2b34a0eae1 - upgrade FS ESL jar to 0.8.1 with changes for recording events 2011-05-03 17:35:19 -04:00
Marco Calderon
64fcc4ac94 Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2011-03-28 07:22:01 +00:00
Richard Alam
553592b3f1 - change dependencies to be able to run on Red5 1.0 RC 
With this change, we will need to package our own Red5 1.0 RC
 2011-04-22 12:00:26 -04:00
Marco Calderon
7c2498597b Added support pubsub for send updates from bbb-apps to bbb-web 2011-03-28 07:19:22 +00:00
Richard Alam
c0e1a1ebcb - fix some compile problems 2011-04-04 11:28:44 -04:00
Richard Alam
19694d87e0 Merge branch 'master' into record-and-playback-feature 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationHandler.java
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
 2011-04-04 11:15:09 -04:00
Richard Alam
9785cde147 - remove unneeded class 2011-03-29 10:04:21 -04:00
Richard Alam
f39dbd4f11 - implement recording listeners for desktop sharing 2011-03-26 15:50:19 -04:00
Richard Alam
17422c3007 - can't really ignore a file that has been tracked by git. The way to ignore changes to a file is to 
git update-index --assume-unchanged src/main/webapp/WEB-INF/bigbluebutton.properties
   which temporarily untracks the file. And then when you want to track again, do
       git update-index --no-assume-unchanged src/main/webapp/WEB-INF/bigbluebutton.properties
 2011-03-23 13:59:51 -04:00
Richard Alam
303920e3c5 - create default bigbluebutton.properties and add to .gitignore. This way, developers 
can customize to match there dev environment and won't checkin their settings
 2011-03-23 12:51:23 -04:00
Richard Alam
92c0af9f49 - remove LIVE|RECORD mode as we are not using it 2011-03-22 10:23:32 -04:00
Richard Alam
2798f4db2b - can't get redis pool working...connect each time for now 2011-03-22 10:19:53 -04:00
Richard Alam
a1d983f204 - disable redis pubsub 2011-03-22 10:19:16 -04:00
Richard Alam
bc293a33f5 - move the tests into proper directory so that gradle can find it 2011-03-18 15:33:16 -04:00
Richard Alam
efb8a84892 - make "gradle test" run the tests 2011-03-18 15:31:09 -04:00
Jeremy Thomerson
47126f4622 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into preupload_docs_beta 2011-03-22 18:15:20 -04:00
Jeremy Thomerson
005f7b74c2 preupload of slides is working 
when a room is created, we scan the directory looking for preuploaded presentations and
share them so that they appear when users join
 2011-03-01 15:45:19 -06:00
Jeremy Thomerson
d2c54b90bd enhance vm-build-debug.sh to exit when there is a build failure 
rather than continuing to start red5 with a broken build
 2011-03-01 14:49:30 -06:00
Marco Calderon
3a19058d54 changes in bbb-apps redis pubsub 2011-02-22 21:45:20 +00:00
Marco Calderon
0fdb2d4875 some changes in bbb-web and bbb-apps for pubsub 2011-02-22 17:13:00 +00:00
Richard Alam
0f0e02de71 - connect to Jedis for each call for now until we figure out how not to get disconnected from Redis after 300sec 2011-02-14 14:17:05 -05:00
Ubuntu
c470d2cbaa Changed bigbluebutton-apps/build.gradle to reference an Env. Var. for local dir 2011-01-31 18:43:52 +00:00
Jeremy Thomerson
79e71b9258 improve scripts to allow easy dev/run cycle 2011-01-13 21:13:29 +00:00
Marco Calderon
ea10e4bb7c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 
Conflicts:
	.gitignore
	bigbluebutton-web/application.properties
 2011-01-03 19:15:11 +00:00
Richard Alam
b4c2edd11d - cleanup and change recording filename to pass timestamp not date 2011-01-26 12:42:55 -05:00
Richard Alam
b493b74de5 - handle start-recording and stop-recording events from freesiwtch 
- record the start-recording and stop-recording events passing in recording timestamps and filename
 2011-01-26 12:21:02 -05:00
Richard Alam
8274e745c1 - fix problem where module and event names are null 2011-01-23 13:34:18 -05:00
Richard Alam
fcee6861bf - missed meetingId in the public chat event 2011-01-23 11:51:30 -05:00
Richard Alam
92c887bd1d - pull events into their own classes so it's easier to track and modify 2011-01-22 21:45:27 -05:00
Richard Alam
1689dca1c9 - can now record voice events 
- to do development: you need to install and run redis 2.04 from http://redis.io/download
 - edit /usr/share/red5/webapps/bigbluebutton/WEB-INF/bigbluebutton.properties to point to your redis host
 - we'll try redis to see how it performs. It's easy to support other mechanism (JMS) if we need to.
 2011-01-21 16:28:31 -05:00
Richard Alam
0e540d6d9a - Collapse recording by removing some intermediate classes (RecorderSession) 2011-01-21 13:09:49 -05:00
Richard Alam
b8c9a9b991 - do an RPUSH instead of an LPUSH 2011-01-20 15:15:49 -05:00
Richard Alam
da37e60618 - add timestampst to recordings 2011-01-20 14:33:08 -05:00
Richard Alam
6d1948f782 Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2011-01-19 11:10:05 -05:00
Marco Calderon
49acc46a5f added storing redis for events properties 2011-01-19 05:53:23 +00:00
Richard Alam
b42b43079b Merge branch 'master' into record-and-playback-feature 2011-01-18 17:36:47 -05:00