BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,921 Commits 13 Branches 260 Tags 1.1 GiB
343f7c7f5c
Commit Graph

1124 Commits

Author SHA1 Message Date
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
Richard Alam
cbcd54cd7b - update broadcast module to work on master 2012-12-21 20:34:33 +00:00
Hugo Lazzari
1f162d9b1c Cleaning code. 2012-12-14 09:04:31 -02:00
Richard Alam
5c8ab54570 - make properties for icecast stream configurable 2012-11-15 18:59:19 +00:00
Markos Calderon
c9976e048e storing pencil shape 2012-11-15 10:52:04 -05: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
Hugo Lazzari
0d77d9cbe8 Global Audio 2012-11-08 15:09:27 -02: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
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
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
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
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
Markos Calderon
9352e198ef setPresenter integrated 2012-09-25 18:29:58 -05:00
Chad Pilkey
a7f3e5aec1 fixed polling module to work with new version of red5 2012-09-24 19:36:56 +00:00
Markos Calderon
23a03c21e7 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into html5-bridge 2012-09-24 14:27:31 -05: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
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
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
Richard Alam
e15ceddb11 - upgrade to latest fs java esl 
- start recording of voice conference when the first person joins the voice conference
Conflicts:
	bigbluebutton-apps/build.gradle
 2011-01-18 11:15:12 -05:00
Richard Alam
12cf6e25cf - start recording of voice when the first person joins the voice conference 2011-01-18 11:04:38 -05:00
Richard Alam
81e98c9d90 - update to new version of fs esl 2011-01-18 11:03:49 -05:00
Marco Calderon
b31ec47a3d added redis support 2011-01-18 14:15:34 +00:00
Richard Alam
26c1a82215 - merge-in latest fs-java-esl from freeswitch-contrib 2011-01-17 16:26:06 -05:00
Richard Alam
18130b3e02 - add jedis dependency 2011-01-14 02:25:42 -05:00
Marco Calderon
e9c120dc9f voice recording for freeswitch 2011-01-12 18:10:50 +00:00
Richard Alam
272e46e38d - upgrade version of bbb-commons to 0.8 2011-01-12 09:50:36 -05:00
Marco Calderon
c0a28e231a Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2010-12-17 12:10:02 +00:00
@deniszgonjanin
872291494b Added recording to whiteboard module, to get a good feeling of how record and playback works. 2010-12-22 00:39:39 +00:00
Marco Calderon
d6c8b30e19 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2010-12-17 12:03:11 +00:00
Marco Calderon
1c39504480 added voice recording freeswitch 2010-12-17 12:01:05 +00:00
@deniszgonjanin
79563801b3 Decoupled sending from recording of chat messages 2010-12-15 18:18:37 +00:00
Richard Alam
095f532e35 - add more info on log so we can correlate with the red5 error.log if the client dropped because of connection problems 2010-11-25 15:59:07 -05:00
Marco Calderon
11167ae29f added chrome plugin patch for test recording 2010-11-19 05:04:16 +00:00
Marco Calderon
49d7ea37f4 fix bug recording 2010-11-17 06:34:18 +00:00
Marco Calderon
2d102450b9 added send parameter record from bbb-web to bbb-apps 2010-11-10 22:40:52 +00:00
Richard Alam
27ebeb1dda - add license headers to bbb-apps 2010-11-06 10:25:30 -04:00
Marco Calderon
f703f6b476 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2010-11-06 10:16:02 +00:00
Marco Calderon
b428e9c3a4 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2010-10-30 00:36:21 +00:00
Richard Alam
ca27def324 - presenter settings are rounded off which screws up presentation synching. Change Long to Double. 2010-10-28 10:38:39 -04:00
Marco Calderon
d186288749 added record conference call to BBB API 2010-10-24 08:59:23 +00:00
Marco Calderon
6b5b610a88 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2010-10-21 12:01:00 +00:00
Richard Alam
91ffaeb27e - hook into shutdown event so we can kick all users from the conference 2010-10-18 13:24:45 -04:00
Richard Alam
48d7e00892 - add methods to kick all users out of the conference 2010-10-18 13:24:12 -04:00
Fred Dixon
e2750b6419 - Added checks bin bbb-conf to see if bbb-voice-conference or bbb-freeswitch-config are installed 2010-10-16 20:51:49 -04:00
Marco Calderon
4fed45a444 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2010-10-14 17:03:04 +00:00
Richard Alam
cceacbfb6e - add an info log when a user join and leave a conference 2010-10-09 11:48:51 -04:00
Marco Calderon
828d1766d6 Support for record directly in files 2010-10-04 23:23:26 +00:00
Richard Alam
0b4f21026c - cleanup and adding bin to gitignore 2010-09-25 11:17:24 -04:00
deniszgonjanin
bdf857b56e Chat History fix for 0.71 2010-09-24 09:12:35 +00:00
Marco Calderon
82101daca5 update recording events 2010-09-22 03:50:32 +00:00
Fred Dixon
db89deba78 Added more checks to bbb-conf & set esl.host=127.0.0.1 in bigbluebutton.properites so we don't need to assign an IP address for red5 to connect to freeswitch 2010-09-20 01:47:17 +00:00
Marco Calderon
839e3e5226 update format message for storing from JSON to XML 2010-09-13 17:22:54 +00:00
deniszgonjanin
b8a1b45e0d Desktop Sharing region selection 2010-09-08 03:56:31 +00:00
Richard Alam
dbbea7ae2a Merge branch 'master' into record-and-playback-feature 
Conflicts:
	bigbluebutton-client/.actionScriptProperties
 2010-08-27 11:05:19 -04:00
Marco Calderon
2f69b4e48b javadoc recorder module - logs updated to java code, playback-web update and playback-client update 2010-08-16 17:41:05 +00:00
Sebastian
4447ac6585 No more need to comment or uncomment "bbb-voice-freeswitch.xml" to use freeswitch or asterisk 2010-08-09 16:36:51 -04:00
Richard Alam
fc05379396 - cleanup the logging which has the old groovy ${var} string 2010-08-09 07:58:31 -04:00
Richard Alam
0ce51b5ba0 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2010-08-09 04:22:41 -04:00
Richard Alam
342e2de46c - change thread sleep to 5 sec from 25 sec as it takes a long time for bbb-apps to startup 2010-08-09 03:35:35 -04:00
Richard Alam
cf865ec52e Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into support-both-ulaw-and-speex 
Conflicts:
	bigbluebutton-client/.actionScriptProperties
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/StreamManager.as
 2010-08-04 10:07:45 -04:00
deniszgonjanin
6142ae978c Merged Neeraj's GSoC Chat Translation into Chat, along with a new User Interface for Chat 2010-08-04 19:47:54 +00:00
Marco Calderon
6c84e2c561 Changes: bbb-apps from groovy to java, add recording module and updated events-recorder and bbb-commons 2010-08-02 10:33:36 +00:00
Richard Alam
3f16b01126 - works great with echo app but not with conference. 2010-07-30 15:41:20 -04:00
Richard Alam
365da7d6c6 - add instructions on how to switch from Asterisk to FS 2010-07-23 14:12:02 -04:00
Richard Alam
c18e312df9 - forgot the import files 2010-07-23 14:07:38 -04:00
Richard Alam
027d85e48f - separate FS and asterisk configs for easy switching 2010-07-23 12:07:53 -04:00
Richard Alam
c847a4ab3b - connect to local freeswitch 2010-07-23 11:39:28 -04:00
Richard Alam
4b5e6196f1 - connect to local freeswitch by default 2010-07-21 16:21:41 -04:00
Richard Alam
916428f7f6 - modify to use resolveDeps 2010-07-21 13:11:20 -04:00
Richard Alam
f77f627707 - rename copyToLib task to resolveDeps (resolve dependencies) 
- add resolver for netty lib
 2010-07-21 13:07:12 -04:00
Leif Jackson
8528b2d287 Merge commit 'bbb/master' 2010-07-14 02:53:29 +00:00
Richard Alam
ec256e7cb7 - upgrading versions from 0.64 to 0.7 2010-07-13 09:42:13 -04:00
Leif Jackson
f236dc5c1c Merge commit 'bbb/master' sync with bbb 2010-07-11 04:28:39 +00:00
Leif Jackson
75dd3b6fd6 Created HeartbeatMonitor Event Observer. Will reconnect to Freeswitch if the switch is restared...etc. TODO: There should be some intergration between the bbb-voice object and the Monitor via the webconference framework To allow for kick all, then warn that FS is not available right now - Could also be extended to use the stats in the Heartbeat such as Idle-CPU, Session-Count, Core-UUID to impement cluster/lb of FS servers 2010-07-01 05:44:46 +00:00
Richard Alam
2c98d5c5e4 - add README 2010-06-30 11:59:58 -04:00
Richard Alam
ca975a9778 - remove IDE specific files 2010-06-30 11:58:57 -04:00
Leif Jackson
c2e97c4b60 NPE exception in Action event handler 2010-06-29 06:58:40 +00:00
Leif Jackson
9decad03c6 Inital import of freeswitch intergration 2010-06-29 04:51:31 +00:00
deniszgonjanin
13790e0bbb Fix for several 0.7 release bugs, as well as a new way for modules to receive updates about users joining and leaving 2010-06-24 07:42:16 +00:00
Richard Alam
b880bbca36 - add files and directories to .gitignore 
- fix problem where webcam icon stays disabled when webcam is closed
 2010-05-31 10:36:15 -04:00
BigBlueButton
e4fd72681a - adding .gitignore 2010-05-30 03:55:46 +00:00
Richard Alam
33d63c1cb7 - add externUserID to participant 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4327 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-14 19:26:31 +00:00
Denis Zgonjanin
40c81337e3 Corrected small bug in whiteboard optimization algorithm 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4302 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-12 16:32:12 +00:00
Denis Zgonjanin
f00f568200 Optimization for whiteboard freehand shapes. Removed unnecessary data points. This improves bandwidth usage, and doesn't choke Flash Player as much when there are a lot of shapes drawn on the same page. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4301 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-12 16:27:12 +00:00
Jeremy Thomerson
aeaa9dd19d fix classpath issue (another reason these eclipse files shouldn't be committed into svn) 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4274 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-07 23:34:15 +00:00
Jeremy Thomerson
c737c7e7f8 add a script to each module that allows me to build / run in dev mode on my vm without having to remember which method I have to build this module in 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4272 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-07 21:53:52 +00:00
Denis Zgonjanin
c7ee585301 Fixed Issue 502 - server side 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4265 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-07 17:44:33 +00:00
Denis Zgonjanin
3c30a4075a Whiteboard red5 server side application 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4235 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-03 12:16:43 +00:00
Richard Alam
6ba909804e - change repo dir to /home/firstuser/dev/repo 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4078 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-31 14:39:14 +00:00
Richard Alam
8741d474b5 - upgrade to red5-0.9.1 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4050 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-29 18:18:31 +00:00
Richard Alam
05eec810bf - remove presentation properly: When the current presentation is removed, clear the presentation window 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3922 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-17 20:37:44 +00:00
Richard Alam
0dc56303fd - fix so that latecomers would have access to the presentations uploaded before they joined. Currently, when a 
presentation get uploaded, then a late participant joins and becomes presenter, he/she cannot switch or load a
previously uploaded presentation

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3918 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-16 20:30:20 +00:00
Jeremy Thomerson
55589f9ca0 end meeting API call now kicks everyone from the conference 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3867 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-09 23:33:25 +00:00
Jeremy Thomerson
ac17421e6c work on end meeting API call (issue #394) 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3864 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-09 19:29:59 +00:00
Jeremy Thomerson
500604eb55 getMeetingInfo API call working 
now just need to add more information to it


git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3796 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 23:59:02 +00:00
Jeremy Thomerson
895ff7d53b spring integration using full-on objects now 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3793 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 21:51:43 +00:00
Jeremy Thomerson
827a65b647 move some common classes to bbb-common-message for spring integration changes 
This commit simply moves a few of the classes to bbb-common-message and makes all of the related build changes to support this change.
No functionality was changed (at least intentionally).

Next step is to change the current Spring Integration messages (conference started / stopped) to send the whole conference in the message and confirm that this is working as intended.  Then it's easy to add other API calls


git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3791 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 20:51:29 +00:00
Jeremy Thomerson
1aec508ef4 adding common messaging jar to classpath 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3784 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 17:30:32 +00:00
Richard Alam
a45d7104f1 - modify local repo to /opt/bigbluebutton/repo so it's more generic and match with Hudson 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3783 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 17:16:42 +00:00
Richard Alam
f2d24be6f3 - modify build.gradle to pull in bbb-common-message from local repo 
- setup scala (Not used for now)

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3780 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 16:34:16 +00:00
Richard Alam
ac3d302727 - upgrade to Red5 0.9 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3743 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-02-19 18:13:23 +00:00
Richard Alam
c165308edb - mute/unmute all except those participants marked as locked. If participant is locked, it will keep it's status as muted or unmuted while the others will be muted/unmuted as requested. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3692 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-02-10 13:48:40 +00:00
Richard Alam
8ae5e7ab59 merge in latest from SVN and fix classpaths 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3681 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-02-08 18:34:55 +00:00
Richard Alam
14da2aa65b - don't create recoding file 
- remove recording for now

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3623 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-02-04 15:14:17 +00:00
Richard Alam
95b1d5567e - add more comment so we don't have to update the wiki 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3443 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-22 21:53:24 +00:00
Richard Alam
d9661be9a3 - latecomers should be able to sync there slide with the presenter's 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3321 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-17 16:51:13 +00:00
Richard Alam
34fbff77d1 - handle new message from bbb-web and send to client 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3168 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-31 19:47:05 +00:00
DJP
6d14ff08db presentation file error handling : new message code depending on specific error 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3114 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-17 23:08:17 +00:00
DJP
e0ff381156 Added error handling on presentation module to be compatible with i18n string generation by Flash client 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3107 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-15 20:45:42 +00:00
Richard Alam
f970b70513 - rename classes 
- modify so that to set which app to use, you need to only modify bigbluebutton.properties
by setting asterisk.application=konference or asterisk.application=meetme

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3102 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-15 17:38:28 +00:00
Richard Alam
1ab69215fe - cleanup 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3081 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-07 21:51:09 +00:00
Richard Alam
12eff569b9 - fix problem where when a second participant joins in, she sees the first participant as muted 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3080 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-07 21:47:10 +00:00
Richard Alam
8b92d6c9a7 - cleanup 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3079 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-07 20:16:59 +00:00
Richard Alam
b73c85b604 - add some instructions on how to configure voice conf app 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3075 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-07 19:00:14 +00:00
Richard Alam
81457e0231 - use spring integration on wiring some of the beans 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3073 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-06 04:38:22 +00:00
Richard Alam
4c324b9f41 - make appkonference as default conference app 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3072 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-06 00:37:50 +00:00
Richard Alam
3714ee2807 - add headers 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3071 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-05 23:04:35 +00:00
Richard Alam
11e8ba68fb - try setting up for spring integration 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3069 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-04 23:15:38 +00:00
Richard Alam
275bb52119 - cleanup 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3068 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-04 22:51:19 +00:00
Richard Alam
ab672bd438 - meetme now works except talker updates 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3067 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-04 22:48:33 +00:00
Richard Alam
0372092bec - meetme now works except talker updates 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3066 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-04 20:56:47 +00:00
Richard Alam
d137362acb - appkonference ami notifications now works...next meetme 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3065 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-04 04:01:29 +00:00
Richard Alam
1091fc3efd - got conference apps implemented 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3064 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-03 22:35:50 +00:00
Richard Alam
7ac82267ad - cleanup 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3062 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-03 16:16:22 +00:00
Richard Alam
51531c90e4 - checking in things..don't want to loose these as eclipse is acting like a spoiled brat this morning :) 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3061 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-03 16:05:03 +00:00
Richard Alam
d7ddb37b27 - implement appkonference events and commands 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3058 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-01 22:34:37 +00:00
Richard Alam
e38ebecda6 - handle new memberId field from AMI events 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3057 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-01 18:24:47 +00:00
Richard Alam
1983b03fa8 - rename classes to match event names generated by appkonference 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3055 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-01 15:55:46 +00:00
Richard Alam
c0e27540e9 - put java classes into java src folder 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3053 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-30 22:17:43 +00:00
Richard Alam
5971e22115 - add appkonference events 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3052 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-30 22:11:15 +00:00
Richard Alam
e24adb55ec - convert build to gradle 
- haven't figured out the tests yet though

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3051 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-30 20:18:53 +00:00
Richard Alam
659c0055b6 - cleanup and move things around 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3050 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-30 17:42:13 +00:00
Richard Alam
ac19017e13 - start refactor bbb-apps 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3049 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-30 17:40:03 +00:00
Richard Alam
ff892e1635 - start refactor bbb-apps 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3048 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-30 17:38:43 +00:00
Richard Alam
822741a3c6 - start refactor bbb-apps 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3046 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-30 17:35:37 +00:00
DJP
829e5c9635 Error handling on file convertion failed - Additional filetype support 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2989 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-11 00:41:24 +00:00
Fred Dixon
ce7112b3eb Depreciated bbb-apps/build.sh 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2841 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-05 22:12:10 +00:00
Richard Alam
7d9ac81c3c - make /usr/share/red5 as default for red5.home 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2833 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-05 15:19:04 +00:00
Fred Dixon
6c3b069a34 Added check-first-run-resolve task to 'ant deploy' to automatically run 'ant resove' the first time in bbb-apps build.xml 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2828 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-05 04:07:25 +00:00
Jeremy Thomerson
65c876c593 simplify the configuration for SI 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2660 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-29 04:44:47 +00:00
Jeremy Thomerson
889984c530 have prototype of end-to-end JMS messaging for conference events with spring integration 
forgot to svn add one new package

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2658 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-28 21:55:51 +00:00
Jeremy Thomerson
66a9477a0b have prototype of end-to-end JMS messaging for conference events with spring integration 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2656 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-28 21:31:04 +00:00
Jeremy Thomerson
a9b1eb8f66 downgrade spring-integration jars since 1.0.3 has problem with grails 1.1.1 
see: http://forum.springsource.org/showthread.php?p=259868


git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2655 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-28 17:52:25 +00:00
Jeremy Thomerson
88cc35c82a got conference ended event working as well 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2654 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-28 16:19:28 +00:00
Jeremy Thomerson
a9b2b1ea06 first working prototype of sending JMS messages with Spring Integration for conference-related events. 
NOTE: this is not a final API or configuration - but simply a checkpoint in the development process.  It will be changing quite a bit over the next week or two

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2653 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-27 21:06:01 +00:00
Jeremy Thomerson
d67008340f some fixes to log messages / some log messages added 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2629 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-25 18:14:38 +00:00
Jeremy Thomerson
ca347c8e40 convert groovy project so it works in eclipse 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2623 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-25 17:34:51 +00:00
Jeremy Thomerson
c37f52013d update svn ignore to ignore build artifacts and fix .classpath for groovy 1.6.4 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2589 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-22 22:42:32 +00:00
Jeremy Thomerson
0338f058c0 updating groovy version on trunk to correct version 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2585 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-22 22:18:13 +00:00
Richard Alam
ecdb39000e - change the location of logs 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2484 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-14 16:17:16 +00:00
Richard Alam
123aab7758 - modify logging layout 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2466 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-11 18:54:18 +00:00
Richard Alam
51ffec86ed - change jmsTemplate to messageListener (see http://www.theserverside.com/news/thread.tss?thread_id=37740) 
- fix logback.xml

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2465 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-11 18:37:25 +00:00
Richard Alam
53bcfac046 - add headers 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2462 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-11 16:00:07 +00:00
Richard Alam
08893f09f3 - change logging to rolling file appender and rotate every day 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2460 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-11 13:58:36 +00:00
Richard Alam
28432aa018 git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2420 af16638f-c34d-0410-8cfa-b39d5352b314 2009-09-10 16:31:24 +00:00
Richard Alam
94e743c7f6 - append logs by default...we don't want to delete the logs when red5 restarts 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2373 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-04 20:14:17 +00:00
Richard Alam
266e16bdad - use ExecutorService to handle JMS messages. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2363 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-04 15:06:30 +00:00
Richard Alam
bde00c7a4a - upgrade versions of junit, commons-lang, mina libs 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2168 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-08-11 15:45:08 +00:00
Richard Alam
0dfa0e1e16 - rename build.properties to bbb-apps-build.properties 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2167 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-08-11 15:43:50 +00:00
Richard Alam
2b7cb3673c - remove cvsdude repo 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2098 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-08-02 11:00:29 +00:00
Denis Zgonjanin
7cbab66ce7 Private chat changes 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1877 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-07-13 19:58:01 +00:00
Denis Zgonjanin
a010aeb8a7 Changes to chat to support private chat 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1857 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-07-10 15:27:45 +00:00
Denis Zgonjanin
2f31d7a1f6 Changes to chat to support private chat 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1856 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-07-10 15:15:38 +00:00
Denis Zgonjanin
f68338ef4d git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1854 af16638f-c34d-0410-8cfa-b39d5352b314 2009-07-09 20:29:33 +00:00
Denis Zgonjanin
8c0aefa99f More private chat stuff 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1853 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-07-09 20:28:44 +00:00
Denis Zgonjanin
85dbfe245e git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1852 af16638f-c34d-0410-8cfa-b39d5352b314 2009-07-09 19:58:17 +00:00
Denis Zgonjanin
2d1ce7d72f Changes to support private chat 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1851 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-07-09 19:32:09 +00:00
Fred Dixon
5d9e4262d8 added LGPL license 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1830 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-30 18:41:58 +00:00
Fred Dixon
8f58fbb59d Adding LGPL license 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1829 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-30 18:39:04 +00:00
Richard Alam
04d7f2942e - removing whiteboard update as it got checkedin to trunk 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1741 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-22 02:22:03 +00:00
minoustudio
738588240e for whiteboard 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1647 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-17 20:33:33 +00:00
Richard Alam
4fa3d4b585 - put in license file 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1603 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-12 15:15:57 +00:00
Richard Alam
9295524808 - check if there is a connection to asterisk and log an error if there is none 
- catch ManagerCommunicationException

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1592 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-10 17:25:49 +00:00
Fred Dixon
d54ad1855b small changes to build.sh for BigBlueButton apps 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1541 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-03 01:47:40 +00:00
Fred Dixon
b0851e9b16 minor updates to build.sh script for BigBlueButton.apps 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1538 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-03 01:25:19 +00:00
Fred Dixon
c4d173bcc7 added build.sh helper script to help build BigBlueButt-apps on Ubuntu linux 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1536 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-02 23:38:41 +00:00
Fred Dixon
18c6f1c3fd removed carriage returns for development on Unix 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1532 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-02 21:52:28 +00:00
Richard Alam
be86377918 - make user's custom build a hidden file 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1516 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-02 13:31:06 +00:00
Richard Alam
1c1801fbf8 - move properties that won't need to be customized into build.xml 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1515 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-01 21:00:21 +00:00
Richard Alam
6635a128ee - move properties that won't need to be customized into build.xml 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1514 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-01 20:47:27 +00:00
Richard Alam
98479eeae7 - rename user's build.properties to bbb-apps-build.properties 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1512 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-01 17:55:15 +00:00
Fred Dixon
72eb992fb7 testing build of bigbluebutton-apps 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1507 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-31 16:05:30 +00:00
Fred Dixon
a3d8481e3f testing build of bigbluebutton-apps 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1506 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-31 16:02:11 +00:00
Fred Dixon
9fb971416a removed syntax error in bigbluebutton.properties in bigbluebutton-apps 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1505 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-31 15:40:40 +00:00
Fred Dixon
559528350b updated bigbluebutton.properties for red5 app 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1486 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-29 14:14:22 +00:00
Fred Dixon
f98f0f9a4f use localhost for location of asterisk server in red5 bigbluebutton.properties 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1480 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-28 22:16:53 +00:00
Richard Alam
b0528e1b5b - fix issue where a participant is not removed from the voice conference room when he/she leaves 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1426 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-08 22:13:07 +00:00
Richard Alam
b1c47b3c60 - include the current presentation name when queried for presentation information 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1422 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-08 17:50:48 +00:00
Richard Alam
5531c16731 - try to kickstart hudson as it is stuck 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1412 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-08 03:04:00 +00:00
Richard Alam
161390a321 - use localhost as default asterisk server 
- do not externalize properties for now

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1400 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-06 19:18:42 +00:00
Richard Alam
4cce0c6cb9 - make it possible to put bigbluebutton.properties external 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1393 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-06 15:19:44 +00:00
Richard Alam
a9935bd4b1 - provide way to set version in properties file so we know which revision we are running 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1391 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-05 18:23:00 +00:00
Richard Alam
7d2d7e50b7 - setup recording only when the host asked the session to be recorded 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1390 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-05 18:04:38 +00:00
Richard Alam
f409469748 - use the voicebridge instead of conference room to connect to voice conference server 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1388 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-05 15:16:31 +00:00
Richard Alam
f371af456e - accidentally deleted params for conference 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1372 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-04 21:41:19 +00:00
Richard Alam
f95cf0e9ee - add record and voicebridge into session passed from the client 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1365 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-02 21:01:49 +00:00
Richard Alam
22aeb0477a - allow several clients to playback a recorded session independently 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1363 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-02 18:09:59 +00:00
Richard Alam
d6183874eb - change ivy.xml to download red5-0.8rc3 instead of re85-0.8rc2 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1360 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-02 14:59:40 +00:00
Richard Alam
c04219d9bd - merge in branches/developers/ritzalam/bbb-apps-playback 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1337 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-29 19:41:23 +00:00
minoustudio
bdb996929b multi-presentation, fix conflict 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1244 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-14 20:35:23 +00:00
minoustudio
dccb79c8e2 20090414: multi-presentation 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1240 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-14 15:47:57 +00:00
Richard Alam
e335c42f29 - record events in XML instead of YAML 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1224 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-09 20:03:16 +00:00
Richard Alam
7f09116ac1 - create sample fixture 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1220 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-08 20:15:33 +00:00
Richard Alam
7cf1233268 - setup structure for fitnesse tests 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1219 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-08 16:01:46 +00:00
Richard Alam
eed6cec676 - extract build properties from build.xml into build.properties 
- create new structure for src and test

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1218 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-07 19:38:07 +00:00
minoustudio
0bc4e34940 seperate red5-web.xml into bbb-apps.xml 
20090407

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1216 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-07 14:35:49 +00:00
Richard Alam
db522ce42b - change red5_home 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1214 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-06 18:00:29 +00:00
Richard Alam
f6d31f50ef - update trunk to red5-0.8rc2 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1213 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-06 17:55:26 +00:00
minoustudio
c842c8196f - remove resolver ibiblio with maven central...ibiblio seems to be always down. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1212 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-06 17:37:11 +00:00
Richard Alam
77ca97e6ea - remove app source dir 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1200 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-01 21:05:00 +00:00
Richard Alam
45ba0811e4 - remove other apps we don't need 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1195 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-01 20:23:53 +00:00
Richard Alam
bd26c3695d - merge branches/developers/ritzalam/bigbluebutton-apps to trunk 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1189 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-01 16:44:39 +00:00
Richard Alam
b112f84466 - merge branches/developers/ritzalam/bigbluebutton-apps to trunk 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1188 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-01 16:39:51 +00:00
Richard Alam
53c80f37f7 - merge branches/developers/ritzalam/bigbluebutton-apps to trunk 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1187 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-01 16:35:20 +00:00
Richard Alam
e1b0737714 - merge branches/developers/ritzalam/bigbluebutton-apps to trunk 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1186 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-01 16:34:38 +00:00
Richard Alam
c5c3032ec6 move testng taskdef into test-compile. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@868 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-21 16:31:16 +00:00
Richard Alam
7dff6bddc7 add spring-jms dependency 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@867 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-21 16:28:40 +00:00
Richard Alam
0d695181f3 couple of tests. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@853 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-20 19:18:05 +00:00
Richard Alam
055a9da1ac Try to write tests with TestNG and Easymock. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@852 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-14 19:00:55 +00:00
Richard Alam
b2edb039a0 Start refactor voice conference app. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@851 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-13 20:46:48 +00:00
Richard Alam
c9702cb233 Setup TestNG and Easymock to be used for tests. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@850 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-13 18:56:28 +00:00
Richard Alam
09f73b1a89 use ivy to publish red5.jar into the local repository so that we can use ivy to get red5.jar as a dependency for bigbluebutton-apps. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@849 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-10 02:15:17 +00:00
Richard Alam
1177a1b61a use ivy to manage dependencies. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@847 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-10 00:11:12 +00:00
Richard Alam
a75a27101b Make build pass the test for now until we sort out the use of ivy. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@844 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-09 15:24:29 +00:00
Richard Alam
8ba521530c use ivy to pull down library dependencies. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@843 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-09 14:37:27 +00:00
Richard Alam
c87f7b0363 Figuring out ivy to manage dependencies. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@842 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-08 15:14:37 +00:00
Richard Alam
a0565c010a Fix compile problem. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@841 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-07 16:22:33 +00:00
Richard Alam
02fa8ef077 Start refactor voice conference app. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@836 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-06 22:44:45 +00:00
Richard Alam
ed884ebda9 set up ivy for dependency management. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@835 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-06 00:13:00 +00:00
Richard Alam
a1b3add78f move voice app under bigbluebutton. start refactoring so that there will only be onw app. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@834 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-06 00:12:14 +00:00
Richard Alam
ef795cc749 start refactor voice app 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@829 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-01-05 02:09:21 +00:00
Richard Alam
c249255458 Add a ping to generate traffic on the connection. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@824 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-31 04:55:15 +00:00
Richard Alam
b792d59131 rename package from bigbluebuttonproject to bigbluebutton 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@822 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-30 15:25:33 +00:00
Richard Alam
88d9ff7f88 Setup unit test structure. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@821 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-30 01:54:34 +00:00
Richard Alam
466244240f deploy should depend on dist. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@819 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-27 16:41:14 +00:00
Richard Alam
8b347898e6 create zip file. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@818 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-27 16:06:19 +00:00
Richard Alam
87a5d4fbfc Create dist files. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@811 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-22 00:12:53 +00:00
Richard Alam
20e552091c restructure folder 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@810 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-21 19:39:17 +00:00
Richard Alam
f993d9084a restructure folder 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@808 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-21 19:30:48 +00:00
Richard Alam
7771d4c821 restructure folder 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@807 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-21 19:30:09 +00:00
Richard Alam
366741b436 restructure folder 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@806 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-21 19:29:44 +00:00
Richard Alam
fa52c5ad67 restructure folder 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@804 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-21 19:28:05 +00:00
Richard Alam
4285f778e5 restructure folder 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@802 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-21 19:26:45 +00:00
Richard Alam
94e3535568 git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@800 af16638f-c34d-0410-8cfa-b39d5352b314 2008-12-21 19:25:16 +00:00
Richard Alam
20bfa49e89 git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@797 af16638f-c34d-0410-8cfa-b39d5352b314 2008-12-21 14:23:47 +00:00
Richard Alam
fd67b9c874 git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@796 af16638f-c34d-0410-8cfa-b39d5352b314 2008-12-21 14:23:20 +00:00
Richard Alam
5903a43cee git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@795 af16638f-c34d-0410-8cfa-b39d5352b314 2008-12-21 14:22:52 +00:00
Richard Alam
f91daccb5d git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@794 af16638f-c34d-0410-8cfa-b39d5352b314 2008-12-21 14:22:27 +00:00
Richard Alam
6a936eb23f git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@793 af16638f-c34d-0410-8cfa-b39d5352b314 2008-12-21 14:21:54 +00:00
Richard Alam
baa2ee475c create dist for each app 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@790 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-20 23:05:46 +00:00
Richard Alam
110c411fdf Make compile work. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@789 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-20 22:20:19 +00:00
Richard Alam
a5df366410 Make compile work. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@788 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-20 22:20:08 +00:00
Richard Alam
84aeaee599 Make compile work. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@787 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-20 22:19:54 +00:00
Richard Alam
9c3f07428a rename folder 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@786 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-20 22:16:32 +00:00
Richard Alam
6c9b10d74e rename folder 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@785 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-20 22:16:03 +00:00
Richard Alam
fbc4ae8c1d rename folder 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@784 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-20 22:15:43 +00:00
Richard Alam
83d4455951 Initial import of apps extracted from bigbluebutton-server. Need to separate our apps from red5 server. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@783 af16638f-c34d-0410-8cfa-b39d5352b314
 2008-12-20 13:55:47 +00:00