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

129 Commits

Author SHA1 Message Date
Richard Alam
e709ff4fbd - build with red5 1.0.2-M1 2014-04-07 17:31:49 +00:00
Richard Alam
17868b5dba - try to upgrade to red5 1.0.2-M1. Need to fix compile and startup issues 2014-04-05 09:22:01 -07:00
Richard Alam
b209dad293 Merge branch 'merge-master-with-new-polling-feature-branch' into merge-polling-with-master 
Conflicts:
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/lock/LockService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonGateway.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/User.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
 2014-01-31 20:07:55 +00:00
Richard Alam
6f502672be - make bbb-apps start again 
- add configgy logging to bbb-apps
 2014-01-31 16:21:49 +00:00
Richard Alam
78be69ecc8 - add spring rabbit, integrations, data-redis dependencies 2013-09-30 18:08:40 +00:00
Richard Alam
d8ae699a36 - update gradle build 2013-09-27 17:43:32 +00:00
Richard Alam
a939588df8 - upgrade to gradle 1.7 
STEPS
cd ~/dev/tools
wget http://services.gradle.org/distributions/gradle-1.7-bin.zip
unzip gradle-1.7-bin.zip
ln -s gradle-1.7 gradle
vi ~/.profile

export GRADLE_HOME=$HOME/dev/tools/gradle
export PATH=$PATH:$GRADLE_HOME/bin

source ~/.profile
 2013-09-17 18:10:52 +00:00
Richard Alam
24361c77f7 - get it to compile 2013-06-07 17:54:32 -04:00
Richard Alam
424ffdb993 Merge branch 'mod-client-communication' into merge-client-invoke 
Conflicts:
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
 2013-06-07 17:27:17 -04: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
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
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
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
e6da7afcdd - upgrade to red5 r4582 2013-03-07 19:48:03 +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
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
4838840aa5 - upgrading red5 jar 2013-02-25 20:41:50 +00:00
Richard Alam
e583c3d603 - embed scala lib 2012-10-30 16:27:19 +00:00
Richard Alam
ad35b2ab08 - upgrade to red5 r4415 2012-09-12 20:39:34 +00:00
Richard Alam
808588cb5d - try upgrading to red5 r4406 2012-09-03 17:15:46 +00:00
Richard Alam
b5b6d5f954 - update red5 to latest (r4316) 2012-04-22 15:03:43 +00: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
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
Richard Alam
1a9c19e1a6 - up version and remove asterisk-java dependency 2011-10-19 15:38:05 -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
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
a9fcd56a88 refactoring bbb-apps 2011-05-11 02:09:10 +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
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
Richard Alam
efb8a84892 - make "gradle test" run the tests 2011-03-18 15:31:09 -04: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
Ubuntu
c470d2cbaa Changed bigbluebutton-apps/build.gradle to reference an Env. Var. for local dir 2011-01-31 18:43:52 +00: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
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
18130b3e02 - add jedis dependency 2011-01-14 02:25:42 -05:00
Richard Alam
272e46e38d - upgrade version of bbb-commons to 0.8 2011-01-12 09:50:36 -05: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
9decad03c6 Inital import of freeswitch intergration 2010-06-29 04:51:31 +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
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
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
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
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