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

696 Commits

Author SHA1 Message Date
Richard Alam
4d3e6de0e9 - return the default config xml without wrapping in a response xml. THis way, the config xml isn;t encoded. 2013-04-28 21:52:14 +00:00
Richard Alam
5cdf1b18f6 - sign the query string for get default config xml 2013-04-17 21:59:51 +00:00
Richard Alam
18bacaa632 - fix NPE when sending incorrect checksum to getDefaultConfigXML call 2013-04-17 18:43:10 +00:00
Fred Dixon
abc074aaa1 Hide the network monitor and editing buttons for layouts module by defult 2013-04-16 19:23:20 -07:00
Markos Calderon
fca07405e0 fixing some configurations 2013-04-10 14:53:45 -05:00
Dale Karp
0813595c61 fixed merges 2013-04-10 17:23:40 +00:00
Jesus Federico
36ed2f6537 Made error messages consistent on setConfigXML 2013-04-05 00:07:41 -04:00
Richard Alam
e35071a050 - add API to allow querying for default config.xml 2013-03-27 18:21:54 +00:00
Richard Alam
27af71f208 - handle passing of config xml 2013-03-27 16:06:03 +00:00
Richard Alam
d9bbc14d80 - remove decoding of config xml to utf-8...I still think we need to encode 
the config xml to utf-8 and decode it
 2013-03-22 15:32:44 +00:00
Richard Alam
8c157a3914 - handle setConfigXML 2013-03-21 17:14:13 +00:00
Richard Alam
0e386adab2 Merge branch 'master' into merge-master-into-dynamic-config 2013-03-15 21:03:13 +00:00
jfederico
f56c4474e6 bigbluebutton-web: Added a footer to welcome message. A disclaimer or copyright signature can be placed here for all the meetings in a server. 2013-03-13 15:01:14 -04:00
Dale Karp
7f03043f78 updated local props file 2013-03-07 17:59:36 +00:00
Markos Calderon
3003280227 Added voicebridge and dialnumber to ExternalApiCalls 2013-02-22 15:37:59 -05:00
Dale Karp
b1a14c98c6 commiting changes made to run env 2013-02-21 17:11:23 +00:00
Markos Calderon
cc1e40d61c Added user customdata to the client 2013-02-19 12:18:12 -05:00
Markos Calderon
1929526a4d added custom data parameter when a user joins to a meeting 2013-02-14 15:59:52 -05:00
Richard Alam
e6fe97db36 Merge branch 'master' into merge-master-into-dynamic-config 2013-02-07 18:53:01 +00:00
Markos Calderon
ba2da7004c Merge almost complete. Still red dot not working 2013-01-25 21:50:32 -05:00
Markos Calderon
740123942d a fix when the name param is not passed in the API 2013-01-23 16:43:06 -05:00
Markos Calderon
f93d40adfe Added property for set max swf file size 2013-01-23 16:01:01 -05:00
Markos Calderon
983f93b0e4 Added license for bigbluebutton-web 2013-01-18 18:24:35 -05:00
Richard Alam
5a95875968 - hash the meeting id with the config xml 2012-12-10 19:05:41 +00:00
Richard Alam
02c6121a6c - rename set and get configxml api 2012-12-09 20:44:52 +00:00
Richard Alam
a70d56ff56 - tie tokens to a meeting 2012-12-09 20:35:09 +00:00
Richard Alam
a0d4c61082 - add ability to post config xml for meeting 2012-12-09 19:29:48 +00:00
Richard Alam
1f620583a2 - allow passing of configURL in create and join api calls 2012-12-09 00:23:33 +00:00
Richard Alam
7ea06bd512 - add defaultAvatarURL property 2012-12-04 19:09:03 +00:00
Richard Alam
1cd682e1e0 - pass avatar in avatarURL during join API call. Have a default avatarURL 2012-12-02 10:57:58 +00:00
Richard Alam
787e1de310 - pass external meeting id to the client and provide JS api to query it 2012-11-20 19:30:08 +00:00
Richard Alam
e63bbfc449 - pass defaultLayout in join api call 2012-11-12 21:05:23 +00:00
jfederico
93b1bbda72 bbb-lti 0.1: Added functionality for passing IMS Global Certification test 
Signed-off-by: jfederico <jesus@123it.ca>
 2012-10-24 16:04:40 -04: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
Markos Calderon
9e45420a4c load presentation in both sides html5 and flex 2012-10-20 14:18:39 -05:00
Richard Alam
2c6b067b01 - convert userid from Number to String 2012-10-02 17:23:15 +00:00
Markos Calderon
5dafac2b25 change long to string 2012-10-01 16:41:33 -05:00
Markos Calderon
23a03c21e7 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into html5-bridge 2012-09-24 14:27:31 -05:00
Markos Calderon
c878ff5d06 added redirect and clientURL parameters to the API 2012-09-21 16:03:53 -05:00
Markos Calderon
ce9d7c1706 API stores meeting in redis, apps stores users in redis 2012-09-14 16:48:05 -07: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
0be1db0cc9 - fix merge edit problem 2012-08-17 14:42:30 +00:00
Chad Pilkey
cfd3446123 Merge remote branch 'upstream/master' 
Conflicts:
	README
	bigbluebutton-client/.gitignore
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2012-08-07 19:56:23 +00:00
Richard Alam
cbe0ee60cc - merge some new stuff 
Conflicts:
	bigbluebutton-web/.gitignore
 2012-07-29 16:06:39 +00:00
Chad Pilkey
17acf9c6df hooked up presentation text 2012-07-24 20:36:29 +00:00
Markos Calderon
3c7419c5ef load textfile from the client 2012-07-17 16:39:32 -07:00
Richard Alam
a8e80c3a9c - make it compile 2012-07-16 19:03:12 +00:00
Ajay Gopinath
27b2e5ad10 Finalized licenses and deleted random backup files and cleaned up repo. 2012-07-15 14:49:42 -04:00
Markos Calderon
3d0b3f9307 added extract text from presentations 2012-07-12 15:49:33 -07:00
Markos Calderon
9fed546de9 Initial changes for extract text 2012-07-11 15:37:31 -07:00
Ajay Gopinath
715cb602c3 Finished text tool 'options'. 2012-07-09 16:43:03 -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
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
Ajay Gopinath
b2e86495c6 Added selection tool and basic recognition of individual objects. Need to fix text tool and allow modification of individual objects. 2012-07-05 16:03:17 -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
1f759c1466 Backup commit before resetting dev env 2012-06-27 18:28:01 -04:00
Markos Calderon
0b63acb6bc Update bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java 2012-04-19 14:08:52 -05:00
Markos Calderon
6183dab2c5 a better way to support old date format 2012-04-14 13:47:31 -07:00
Markos Calderon
1720b4bdda Adding support for old date format 2012-04-14 11:20:01 -07:00
Richard Alam
5177a1737a - allow admin to turn off recording for whole server 2012-03-29 16:26:10 +00:00
Markos Calderon
c4d866419c change date format in getRecordings for bigbluebutton 0.8 2012-03-26 13:47:35 -07:00
Richard Alam
d8274e0920 - send the number of slide completed instead of page number 2012-03-09 22:17:43 +00:00
Richard Alam
8527f3fe1b - remove cancelling of task as we have put timouts already in the external proc calls 2012-03-08 17:22:01 +00:00
Richard Alam
ea087125db - increase max pages for uploaded presentation 2012-03-08 17:21:35 +00:00
Richard Alam
bab14dc466 - add a timeout when executing external process to prevent doc convertion from hanging in case 
external command goes wrong
 2012-03-08 16:52:17 +00:00
Richard Alam
c331f9aaaf log received message from redis pubsub 2012-03-08 16:46:37 +00:00
Richard Alam
dafc3deb96 - create blank thumbnails for pages that failed to generate one 2012-03-07 17:28:18 +00:00
Richard Alam
6e73b5ee16 - improve logging for doc conversion 2012-03-07 16:24:44 +00:00
Richard Alam
197e07e289 - remove logging as it's too much 2012-03-07 16:23:06 +00:00
Markos Calderon
64b27f2ebe fix end meeting 2012-03-05 15:26:13 -08:00
Markos Calderon
cd584ba6ef fix for end meeting 2012-02-23 16:18:40 -08:00
Markos Calderon
59071bcb52 fix for end meeting request 2012-02-16 12:51:57 -08:00
Richard Alam
a73287ea29 - store logout url into a session to make sure we get a logour url for a user 2012-02-01 23:04:12 +00:00
Richard Alam
742fd24b2d - redirect to landing page when user refresh the browser and there is no session 2012-02-01 22:11:36 +00:00
Richard Alam
bc54a34736 - test if storing user info in hashmap will cleanup on tomcat6 restarts...on tomcat6 restarts, sessions 
aren't destroyed which allows users to join the meeting by just refreshing the browser which screws up
   bbb-apps state
 2012-02-01 20:51:43 +00:00
Richard Alam
456042f74c - add logging when trying to join session...investigating why we are allowed to refresh 
browser and join conference after restart of BBB
 2012-02-01 19:05:52 +00:00
Markos Calderon
d2c317c900 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-01-27 12:22:16 -08:00
Markos Calderon
01a90feab5 improvement for generate thumbnails 2012-01-27 12:21:48 -08:00
Markos Calderon
17097c26f7 Merge pull request #23 from gugat/issue1112 
In Api upload, strip any extension from the presentation directory
 2012-01-26 10:37:12 -08:00
Fred Dixon
f997391899 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-01-19 21:22:55 -05:00
Fred Dixon
6bcb73e014 Set 
removeMeetingWhenEnded=true

as default in bigbluebutton.properties.  This will reduce errors with 3rd party integrations when users end a meeting, change a parameter, then try
start the meeting again.
 2012-01-19 21:21:19 -05:00
Richard Alam
ecc979e274 - generate internal userid to be able to match users across subsytems 2012-01-18 15:46:29 +00:00
Fred Dixon
20d4587e3e Changed API welcome messages from 'use a headset to avoide echo' to 'you can mute yourself in the listeners window' (BigBlueButton 0.8 now uses Flash for acoustic echo cancellation) 2012-01-15 12:32:39 -05:00
Fred Dixon
bf254501f5 Changed bbb-web to using a rolling 20 days of logs 2012-01-15 12:31:14 -05:00
Fred Dixon
b66059168d increased the size of bbb-web.log to 25M and keep six rolling files (instead of three) 2012-01-15 12:05:21 -05:00
Markos Calderon
f82633fc75 adding logs to pubsub updates 2012-01-11 13:31:45 -08:00
Markos Calderon
e4ed4b868a fix end time when someone rejoins to a meeting 2012-01-11 13:17:09 -08:00
gugat
eba253fa04 In Api upload strip any extension from the presentation directory 2012-01-11 14:34:16 -05:00
Richard Alam
9c8aeae213 - if there are no pre-uploaded presentation passed through the api, pre-upload a default presentation 2012-01-10 16:25:46 +00:00
Richard Alam
180d1acc58 - Make defaultLogoutUrl not blank so that bbb-conf --check does not complain 2012-01-09 23:23:44 +00:00
Markos Calderon
ea5331d0c9 now, bbb-web uses the internalUserId 2012-01-09 14:44:14 -08:00
Markos Calderon
2ad5c4365b fix to handle exceptions the updates of the API 2012-01-09 10:20:57 -08:00
gugat
1beac318f9 Meeting stays created infinitely when defaultMeetingCreateJoinDuration=0 
Solves issue 1097
 2011-12-18 11:46:09 -05:00
Markos Calderon
e84a27c51c added config file for jedispool 2011-12-12 15:18:52 -08:00
Markos Calderon
c2b0f1588f fix urlencode in pre upload 2011-11-11 09:23:30 -08:00
Richard Alam
c5043a9f1d - fix the name properly as there are 60000 millis in a minute 2011-10-24 22:07:18 +00:00
Richard Alam
b52f5ae158 make it return the same response as 0.71a (fix isse 1027 http://code.google.com/p/bigbluebutton/issues/detail?id=1027) 2011-10-02 23:24:00 -04:00
Marco Calderon
d91607b1d8 changes to the length 2011-09-28 12:37:26 -05:00
Marco Calderon
6b7cdd3528 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-09-26 11:38:01 -05:00
Marco Calderon
a5a2fd67e0 a try-catch for compability with the old recordings 2011-09-26 11:36:46 -05:00
Richard Alam
f60023e7c9 Make meeting name optional to not break Moodle 1.9 integration 2011-09-23 19:15:59 -04:00
Marco Calderon
3425db56e7 added voicebridge to getMeetingInfo 2011-09-23 11:04:14 -05:00
Marco Calderon
261707478b fixed recording time 2011-09-22 12:50:35 -05:00
Richard Alam
1164bb3e8f - setup logout url when user enters instead of when user leaves because when the user clicks on the OK button 
on the logout window after one minute, the meeting is gone from bbb-web memory.
 2011-09-13 14:34:36 -04:00
Fred Dixon
9e93cc7b86 Removed depreciated message (we can look at this post 0.8) 2011-09-08 17:25:19 -07:00
Marco Calderon
c36951dca6 updated messaging module in bbb-apps 2011-09-08 12:11:34 -05:00
Marco Calderon
6a47157b22 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-09-06 12:47:35 -05:00
Marco Calderon
b80e4ea5a1 Added CDATA to getRecordings 2011-09-06 12:46:54 -05:00
Richard Alam
ed44841a4c - handle only pre-upload on first create API call 2011-09-06 11:48:38 -04:00
Fred Dixon
f4bc50a179 Modified default welcome message to give a bit more help to first time users. 2011-09-04 15:48:51 -07:00
Fred Dixon
b5f0464c46 Removed old API demos from bigbluebutton-web ... they are now moved to bbb-api-demo 2011-09-04 08:00:08 -07:00
Richard Alam
b9de9180eb - remove interface dec to fix bbb-web build breakage 2011-09-02 09:56:45 -04:00
Marco Calderon
ff575071d9 fix metadata values 2011-09-01 19:46:29 -05:00
Marco Calderon
6e41cae223 some fixes in the api 2011-08-31 17:22:10 +00:00
Marco Calderon
2db74d4d06 small fix for invalid password 2011-08-24 19:39:57 +00:00
Marco Calderon
deae7b0d15 fix for errors in api 2011-08-24 16:27:37 +00:00
Marco Calderon
dbd04839ec added backward compatibility for errors 2011-08-23 19:19:25 +00:00
Marco Calderon
5e457b71d1 initial backward compability for 0.71a 2011-08-23 02:46:37 +00:00
Richard Alam
160b037570 - the meeting has not actually ended when a user is in the meeting. Our logic removes the meeting when 
everyone leaves and a user rejoins the meeting within 1 minute.
 2011-08-22 15:12:34 -04:00
Richard Alam
ea76262a7c - add more logging to figure out why we are ending the meeting pre-maturely 2011-08-22 13:36:10 -04:00
Marco Calderon
4d734506f4 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-08-17 15:41:43 +00:00
Richard Alam
7089da4f16 - Add more logs to figure out why we are cleaning meeting pre-maturely 
- Don't process recording for meeting that we are cleaning because no one joined it.
 2011-08-19 11:27:00 -04:00
Richard Alam
d591cbc07f - remove meeting if nobody joined after a certain number of minutes when the meeting was created 2011-08-19 10:41:53 -04:00
Richard Alam
28a8db58a3 - remove FLAT_REPO as we don't need it anymore. 2011-08-17 20:17:57 +00:00
Marco Calderon
e190d80e50 fixed name in meetings 2011-08-17 15:26:06 +00:00
Marco Calderon
f052b776d7 a temp solution for show the recording name 2011-08-10 14:33:04 +00:00
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