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

519 Commits

Author SHA1 Message Date
Marco Calderon
18fba79c4c Added metadata to getMeetingInfo 2011-08-04 23:14:08 +00:00
Richard Alam
daeb7fafc2 - bump api version to 0.8 2011-08-04 10:35:49 -04:00
Richard Alam
8ffc8c9bdc - hook-up expired meeting background proc 2011-07-23 16:53:34 -04:00
Richard Alam
3c76ace954 - have the background cleaner run eveyr minute 2011-07-23 16:47:06 -04:00
Richard Alam
0525511764 - add logging for meeting cleaner background proc 2011-07-23 16:36:27 -04:00
Richard Alam
8e983345b8 - add property to set timeout for allowing time between creating a meeting and joining a meeting 
- change default meeting expiration to 1 minute
 - trigger ingest and processing when the meeting is removed form memory instead of when the last
   user leaves the meeting
 2011-07-23 11:13:29 -04:00
Marco Calderon
d32110d36c api according to the latest spec 2011-06-30 02:33:12 +00:00
Richard Alam
2c65cc9ac2 - fix possible NPE when getting internal id of non-existing meeting 2011-07-20 15:26:19 -04: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
4d2e503214 - add param to remove the meeting right away from memory instead of letting 
it linger for about an hour (the value of the expire meeting).
 2011-07-19 16:03:36 -04:00
Richard Alam
46ea659796 - change default meeting duration to 0 (zero) which means no duration. This maintains 
compatibility with previous release allwoing the demo meeting to run infinitely (for
   example). 3rd-party apps must pass duration if they want to set it, especially if the
   meeting is being recorded.
 2011-07-19 15:27:18 -04:00
Richard Alam
c5f8aa9344 - rename simple playback to slides playback 2011-07-19 14:33:17 -04:00
Richard Alam
1796fbc777 - if there are any users in the meeting, then meeting is running 
- set the meeting to forciblyEnded if the end api has been called
 2011-07-19 13:49:11 -04:00
Marco Calderon
dd57d38fc4 fixed preupload 2011-06-24 21:04:10 +00:00
Marco Calderon
b9ee42b30d finish demo recording 2011-06-24 16:28:32 +00:00
Marco Calderon
e5e061ea99 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into refactor-bbb-api 2011-06-23 07:55:19 +00:00
Richard Alam
d44fd0cbdd Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-07-10 16:13:02 -04:00
Richard Alam
8a013304b6 - fix problem where %%CONFNAME%% doesn't get substituted 2011-07-10 16:11:14 -04:00
Fred Dixon
6f6cc70c6b Change set redisHost to 127.0.0.1 to match other config files 2011-07-10 10:23:01 -07:00
Richard Alam
9c3389e68f - fix problem for getting viewer password 2011-07-08 17:04:51 -04:00
Richard Alam
15990d2f55 - start hooking the api for recording 2011-06-27 12:52:17 -04:00
Richard Alam
7f4d38b5a6 - process metdata properly and simple playback 2011-06-26 10:56:03 -04:00
Richard Alam
dbfd92bff2 - fix join and create api 2011-06-24 11:09:12 -04:00
Richard Alam
9b3d901e34 - move things around 2011-06-24 10:57:56 -04:00
Richard Alam
c9ad8f15d7 - temporary commit 2011-06-23 17:02:37 -04:00
Richard Alam
f8abc966e9 - fix logout 2011-06-23 14:18:20 -04:00
Richard Alam
8c8e009baa - unit test passing again 2011-06-23 14:04:00 -04:00
Marco Calderon
af70819578 finish demo recordings 2011-06-23 07:54:23 +00:00
Richard Alam
e9bd55a563 - fix compile problem...get recordings isn't wired yet 2011-06-22 16:40:23 -04:00
Richard Alam
15b29db03f - add playback format into metadata.xml 
- implement get recordings for a meeting id
 2011-06-22 16:35:11 -04:00
Richard Alam
d044221d70 - start implementing get recording api 2011-06-22 15:53:27 -04:00
Marco Calderon
f02f1efffe need to add actions publish, unpublish, delete to the demo10 2011-06-22 06:32:08 +00: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
140c187fd0 - clean-up 2011-06-20 16:36:41 -04:00
Richard Alam
3b67e6b5ef - group errors and send them all at once to the caller of the api 
- make errors consistent
 - return back createTime on a create API call
 - require createTime parameter on a join API call. This way users with stale join link won't be
   able to join a running meeting.
 2011-06-20 16:18:57 -04:00
Marco Calderon
fd8296c183 finish API 0.8... need to update response messages 2011-06-16 18:37:14 +00:00
Marco Calderon
42f4acd250 added setpublish, pending response xml 2011-06-16 14:43:31 +00:00
Marco Calderon
fc55bb8aee added to check multiple recordings in the call getRecordings 2011-03-08 21:06:04 +00:00
Marco Calderon
625d54e86c getRecordings call... Need to show metadata values 2011-03-08 09:44:31 +00:00
Marco Calderon
81627bc616 initial cleanup 2011-03-07 20:18:33 +00:00
Marco Calderon
356c77b41f removed redisport and redishost properties 2011-03-07 06:15:02 +00:00
Richard Alam
2454e6b9a1 - add timestamp to internal meeting id. So that the external meeting id can be re-used 
especially if the meeting is recorded.
 2011-06-16 16:45:14 -04:00
Richard Alam
8ba1e6484a Merge branch 'master' into ref-bbb-web-2 
Conflicts:
	bbb-video/.gitignore
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/RedisDispatcher.java
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
	bigbluebutton-web/src/java/org/bigbluebutton/api/RedisDispatcherImp.java
 2011-06-16 14:49:57 -04:00
Richard Alam
7cdc6adb83 - cleanup 2011-06-16 14:43:40 -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
Richard Alam
2765a178ce - merging changes from Markos 
Conflicts:
	bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/presentation/OfficeToPdfConversionSuccessFilter.java
	bigbluebutton-web/src/java/org/bigbluebutton/presentation/SupportedDocumentFilter.java
	bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/SwfSlidesGenerationProgressNotifier.java
 2011-06-16 09:28:14 -04:00
Richard Alam
0452324425 - putting back code 2011-06-16 09:18:57 -04:00
Richard Alam
120275071e - now DI works fine...had to delete bin and target dirs remnants from maven build 2011-06-15 17:28:31 -04:00
Richard Alam
58b51c9146 - remove spring integration....having problem with dependency injection 2011-06-15 16:57:06 -04:00
Marco Calderon
d022aafb61 Cleanup bigbluebutton-web and bigbluebutton-apps 2011-06-15 08:30:56 +00:00
Marco Calderon
04dff406e8 Merge branch 'ref-bbb-web-2' of github.com:bigbluebutton/bigbluebutton into ref-bbb-web-2 
Conflicts:
	bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
 2011-06-14 01:47:32 +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
Richard Alam
769470e232 - remove jms messages 2011-06-10 15:29:11 -04: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
09e7475cd7 - point recorded status dir to the correct one 2011-06-03 11:19:53 -04:00
Richard Alam
1bb6e20291 - renamed ingenst-and-processing script 
- log when saving metadata
 2011-06-03 11:15:24 -04:00
Richard Alam
c3b0e376c5 Merge branch 'master' into ref-bbb-web-2 
Conflicts:
	bigbluebutton-web/src/java/org/bigbluebutton/api/RedisDispatcherImp.java
 2011-06-02 16:40:36 -04:00
Markos Calderon
105f13cc9a Edited bigbluebutton-web/web-app/demo/demo6.jsp via GitHub 2011-06-02 08:47:29 -07:00
Markos Calderon
196a9ccc2c fix demo6 2011-06-02 08:39:57 -07:00
Richard Alam
53ecbf53ba - cleanup 
- just store meeting info into metadata redis key
 2011-06-02 11:31:52 -04:00
Richard Alam
134be90359 - handle incoming messages from bbb-apps 2011-06-01 17:58:55 -04:00
Richard Alam
50dac08e11 - cleanup sign out api 2011-06-01 14:16:35 -04:00
Richard Alam
c6626c7a9a - write test for get meetings api 2011-06-01 12:42:50 -04:00
Richard Alam
ed1bf9d4f6 - implement test for get meeting info 2011-06-01 12:10:33 -04:00
Richard Alam
8d63e0a717 - continue refactoring bbb-web, renamed a few classes, and change get-meetings-info api 2011-06-01 10:51:40 -04:00
Marco Calderon
1b8011fdce Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-06-01 05:31:12 +00:00
Richard Alam
de9f45bee9 - add meeting metadata 2011-06-01 18:07:57 -04:00
Marco Calderon
65c020fac0 demo recording page 2011-06-01 05:30:17 +00:00
Richard Alam
46a769cf2f - add test for end api 2011-06-01 02:47:01 +00:00
Richard Alam
c114289042 - add test for isMeetingRunning api 2011-05-31 17:51:07 -04:00
Richard Alam
e3ef2e5f6f - add isMeetingRunning test 2011-05-31 16:59:04 -04:00
Richard Alam
6f9563b190 - put some steps into own methods 2011-05-31 16:10:31 -04:00
Richard Alam
78adae0696 - join and create api have unit tests 2011-05-31 15:23:44 -04:00
Richard Alam
c40976dab5 - generate default voice conf numbers if none has been passed in the param. 2011-05-31 10:05:09 -04:00
Richard Alam
26f98fe879 - write test for create api 2011-05-30 17:39:03 -04:00
Richard Alam
cfe20900f2 - now has setup for testing 2011-05-30 16:26:11 -04:00
Richard Alam
335fd9591d - start refactoring bbb-web again...without trying to merge remove-bbb-commons branch 2011-05-30 01:42:50 +00:00
Richard Alam
4745b0e381 - run pubsub listener on own thread 2011-05-29 03:24:39 +00:00
Richard Alam
01669ce4d7 - move api controller test to another package 2011-05-29 02:33:37 +00:00
Richard Alam
db6f7b49f3 - put all redis classes into Messaging Service 
- wee need to be able to mock the messaging service to make it unit testable
 2011-05-29 02:32:13 +00:00
Richard Alam
ad9a4895b8 - cleanup jars 2011-05-28 17:57:09 +00:00
Richard Alam
0fbdd39a90 - add default metadata 2011-05-27 18:41:14 -04:00
Richard Alam
bc6c392da3 - formatting changes 2011-05-27 11:36:50 -04:00
Richard Alam
4748352a87 - remove bigbluebutton.properties override 2011-05-27 11:36:10 -04:00
Richard Alam
e4af92a9cc - start writing record api 2011-05-26 16:48:49 -04:00
Richard Alam
63636da8dc - add api controller unit tests 2011-05-26 14:25:31 -04:00
Richard Alam
54677ea07b - add README 2011-05-26 14:24:03 -04:00
Richard Alam
1e9a835615 - cleanup of bbb-web 2011-05-26 14:00:08 -04: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
Richard Alam
e56ce0bd36 - have bbb-web write the recroding <meeting-id>.done file 2011-05-05 18:38:22 -04:00
Richard Alam
61ea9015e5 - set redis host and port in properties file 2011-05-04 11:14:35 -04:00
Richard Alam
e7bbf63484 Merge branch 'master' into record-and-playback-feature 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2011-05-03 14:50:37 -04:00
Marco Calderon
48029bf469 update thin instructions and layout 2011-04-28 20:28:33 +00:00
BigBlueButton
4db0ee6cf3 Fixed disconnect bug. 2011-04-12 20:08:31 +00:00
Marco Calderon
40cca71b04 added metadata parameter 2011-03-28 12:07:00 +00: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
65d6e61890 - call the ruby scripts from bbb-web 2011-04-15 18:19:51 -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
a1d983f204 - disable redis pubsub 2011-03-22 10:19:16 -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
Marco Calderon
0fdb2d4875 some changes in bbb-web and bbb-apps for pubsub 2011-02-22 17:13:00 +00:00
Richard Alam
19c3971e1f - store meeting info in redis so we can include in events.xml 2011-02-16 10:34:49 -05:00
Richard Alam
fe44e0bf53 - setup jedis so we can put conference metadata into events.xml 2011-02-15 11:43:53 -05:00
Richard Alam
d1e2af2f38 - add eclipse plugin 2011-02-15 11:43:17 -05:00
Richard Alam
7fa4f4bbe8 - rename copyToLib to resolveDeps to be consistent with bbb-apps 2011-02-15 11:00:56 -05:00
Richard Alam
dda58fe6bb - put rec and playback required params in properties file 2011-02-15 10:41:15 -05:00
Richard Alam
a8d9a48fb2 - trigger archive, ingest, publish of recording when the last user leaves the meeting 2011-02-14 14:18:21 -05:00
Richard Alam
8d895d7417 - add temp way to trigger ingest and processing 2011-02-11 15:31:34 -05:00
Jeremy Thomerson
7a236a6809 downloading and processing of files works for urls and encoded files 2011-01-25 17:28:57 -06:00
Ubuntu
f255ba5e2b Changed bigbluebutton-web/build.gradle to reference Env. Var. for local repo 2011-01-31 18:51:01 +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
Jeremy Thomerson
c8b24e849c more work on doc pre upload - xml parsing 
now we are parsing xml that is passed in following example format:
<?xml version="1.0" encoding="UTF-8"?>
<modules>
        <module name="foo">
        </module>
        <module name="presentation">
                <document url="http://www.samplepdf.com/sample.pdf" />
        </module>
</modules>
 2011-01-14 19:16:09 -06:00
Jeremy Thomerson
ef6bd3a5f1 first test of preuploading documents in api create command 
this commit is for testing only
it simply gets apicontroller working with presentationservice
it uses a test file on the server - rather than accepting files in
the http request (which is the next step)
 2011-01-14 18:07:18 -06: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
0f82ae3e26 - add getters and setters 2011-01-19 11:36:48 -05:00
Richard Alam
d0184c8210 - cleaning up bbb-web 2011-01-19 11:09:50 -05:00
Richard Alam
b42b43079b Merge branch 'master' into record-and-playback-feature 2011-01-18 17:36:47 -05:00
Richard Alam
272e46e38d - upgrade version of bbb-commons to 0.8 2011-01-12 09:50:36 -05:00
Marco Calderon
e9c120dc9f voice recording for freeswitch 2011-01-12 18:10:50 +00:00
Marco Calderon
f37093d533 update demo filesfor support recording 2011-01-10 12:08:54 +00: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
d18276e64f Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2010-11-11 03:01:42 +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
18b46ba729 - change conf num to start with 7 as that's what we have in the dialplan 2010-11-09 08:24:09 -05:00
Richard Alam
d01662da3e - handle findConference AGI call to check if a conference with a particular number is running 2010-11-02 09:39:56 -04:00
Marco Calderon
70d8e805b1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2010-10-30 19:54:08 +00:00
Marco Calderon
78794d5952 Fix bigbluebutton-web for recording 2010-10-30 19:51:40 +00:00
Marco Calderon
d186288749 added record conference call to BBB API 2010-10-24 08:59:23 +00:00
Richard Alam
920b21323e - set session timeout to 3 hours 2010-10-06 10:20:15 -04:00
Richard Alam
0c8977dfde Merge branch 'master' into merging-fs-support 
Conflicts:
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PublicScheduledSessionController.groovy
 2010-07-20 16:28:59 -04:00
BigBlueButton
333dd13d6b - fixed few issues and cleaned up 2010-07-19 20:23:28 +00:00
BigBlueButton
ea156fe61e Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-07-19 19:45:52 +00:00
BigBlueButton
cad05a9ce1 - bbb-scheduling has been removed from bbb-web 2010-07-19 19:27:24 +00:00
BigBlueButton
1e6eff084b - Removed bbb-web scheduler 
- Merged the enter and signout function into the api controller
 2010-07-19 19:15:01 +00:00
Richard Alam
af873d63e8 - ignore bbb_conf_api.jsp as it's dynamically generated 2010-07-19 11:32:29 -04:00
Richard Alam
790e42dc86 Merge branch 'ljackson-master' into merging-fs-support 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/managers/ModuleManager.as
 2010-07-16 15:23:22 -04:00
Richard Alam
0e3286667b - change the api version to 0.7 2010-07-14 16:36:08 -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
Richard Alam
8968fb3593 - ignore bbb_conf_api.jsp 2010-07-12 16:21:06 -04:00
Richard Alam
ac92ed3756 - remove linefeeds 2010-07-12 16:05:31 -04:00
Richard Alam
0fb463a7c2 - put in a working demo1.jsp 2010-07-12 15:48:18 -04:00
Sebastian
5a27c0ebc3 Fixed a bug 2010-07-12 14:01:46 -04:00
Sebastian
a2124651e8 Fixed linefeeds in demo1.jsp 2010-07-12 12:23:14 -04:00
Leif Jackson
f236dc5c1c Merge commit 'bbb/master' sync with bbb 2010-07-11 04:28:39 +00:00
Sebastian
da9f036339 Removed a space character in demo_footer.jsp 2010-07-02 14:15:30 -04:00