Richard Alam
8708cac9be
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2011-06-27 09:35:00 -04:00
Richard Alam
c1860ac53c
- add duration on StopWebcamEvent
2011-06-27 09:34:36 -04:00
Fred Dixon
fc57a06bd3
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2011-06-26 10:42:39 -07:00
Fred Dixon
09d72242f8
Starting to add logic in bbb-conf to help debug record and playback
2011-06-26 10:42:31 -07:00
Richard Alam
b49ddec9f0
- remove adding timstamp in recording filename as it screws up ingest and processing
2011-06-26 12:15:31 -04:00
Richard Alam
41db771068
- change default matterhoen server
2011-06-26 11:17:47 -04:00
Richard Alam
0e9057d26d
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2011-06-26 10:56:34 -04:00
Richard Alam
7f4d38b5a6
- process metdata properly and simple playback
2011-06-26 10:56:03 -04:00
Localization Server
737e1c9767
Updating locale
2011-06-25 06:00:05 +00:00
Marco Calderon
8e698f51a9
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into refactor-bbb-api
2011-06-24 21:06:47 +00:00
Marco Calderon
dd57d38fc4
fixed preupload
2011-06-24 21:04:10 +00:00
Richard Alam
869ea7662f
- Merge branch 'echo-cancel' of git://github.com/bigbluebutton/bigbluebutton into echo-cancel
...
- Make compile with Flex SDK 4.5 and with v0.71a VM
Conflicts:
bigbluebutton-client/build.xml
bigbluebutton-client/html-template/index.template.html
bigbluebutton-client/src/org/bigbluebutton/main/views/LanguageSelector.mxml
2011-06-24 19:31:08 +00:00
Marco Calderon
c3f8fcb922
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into refactor-bbb-api
2011-06-24 16:29:47 +00:00
Marco Calderon
b9ee42b30d
finish demo recording
2011-06-24 16:28:32 +00: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
491d84f645
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2011-06-23 14:04:24 -04:00
Richard Alam
8c8e009baa
- unit test passing again
2011-06-23 14:04:00 -04:00
Localization Server
8772358c4a
Updating locale
2011-06-23 08:00:02 +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
Marco Calderon
af70819578
finish demo recordings
2011-06-23 07:54:23 +00:00
Localization Server
ec07babe47
Updating locale
2011-06-23 06:20:01 +00:00
Markos Calderon
d9d0d230ba
Merge pull request #10 from gugat/refactor
...
Refactor
2011-06-22 17:01:58 -07: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
8931bb854b
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2011-06-22 15:54:05 -04:00
Richard Alam
d044221d70
- start implementing get recording api
2011-06-22 15:53:27 -04:00
Localization Server
77a7744ad0
Updating locale
2011-06-22 09:20:01 +00:00
Localization Server
246f176476
Updating locale
2011-06-22 08:20:01 +00:00
Marco Calderon
f02f1efffe
need to add actions publish, unpublish, delete to the demo10
2011-06-22 06:32:08 +00:00
Localization Server
21bbbc7cb5
Updating locale
2011-06-22 06:00:03 +00:00
Richard Alam
e250068db3
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2011-06-21 14:18:04 -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
Localization Server
86710d5ec5
Updating locale
2011-06-21 10:00:03 +00: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
gugat
cba6fef830
Remove target folder
...
Write steps to run bbb-api-demo in README
2011-06-17 18:12:31 +00:00
gugat
26b2e2c5d9
Add commons io jar in build.gradle
...
Change action in demo7 and demo8 forms, they where demo5 and demo6
2011-06-17 18:01:37 +00:00
Marco Calderon
9372282019
api demo10
2011-06-17 09:49:16 +00:00
gugat
a74d8d03c5
Change joinUrl method
2011-06-17 07:33:06 +00:00
Marco Calderon
447feb72f7
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into refactor-bbb-api
2011-06-17 03:11:54 +00: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
6d53c5025d
Merge branch 'refactor-bbb-api' of github.com:bigbluebutton/bigbluebutton into refactor-bbb-api
2011-06-16 09:34:18 +00:00
gugat
0d3d432062
All jsp files inside webapp
...
Add version in build.gradle and war parameters
Add links to bbb-api-demo jsp in demo_header.jsp
Choose bbb_api.jsp from bbb-api-demo.
Add README, to post notes
2011-06-16 00:54:53 +00:00
guga
84c2991b69
Delete README2
2011-06-15 20:30:51 +00:00
guga
edd68bd0f6
Another test
2011-06-15 20:28:09 +00:00
=
a0b8f23e07
Test: Delete README
2011-06-15 20:24:03 +00:00