Commit Graph

3268 Commits

Author SHA1 Message Date
Richard Alam
84506d7931 - disable publish button when publishing has started...this fixes the problem where
a user can publish the webcam more than once
2011-07-06 14:07:45 +00:00
Richard Alam
ca7663044a - fix deskstop sharing...it chokes on this line
setCurrentState("dispQuitControlBar");
   I'm not sure why. To fix, just combined the "Close" button
   with the "Fullscreen" and "Region" button.
2011-07-05 16:07:42 +00:00
Richard Alam
9ccd216042 - propagate webcam fixes from master 2011-07-05 14:13:46 +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
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
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
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
gugat
a74d8d03c5 Change joinUrl method 2011-06-17 07:33:06 +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
=
54189c6156 Test:Add README 2011-06-15 20:21:55 +00:00
=
bb21ffeb2c Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into refactor 2011-06-15 20:09:50 +00:00
Richard Alam
ef40a1cb28 - cleanup
- make the length of the blank video into a float instead of int. This way we hope to have
   a blank video with 8.74sec long instead of 8sec long.
2011-06-15 12:20:10 -04:00
BigBlueButton
a5a896a4dc Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into refactor 2011-06-14 23:16:25 +00:00
root
bd7d6a7471 Deleted .jar and .war ... should not be uploaded 2011-06-14 23:10:54 +00:00
root
258f9925db Delete bbb-api-demo-gradle 2011-06-14 23:01:50 +00:00
root
d8458f968b Maven structure, dependencies in gradle 2011-06-14 22:50:34 +00:00
Richard Alam
181133ab9e - add matterhorn-install script. There is still a problme of it not starting on my machine. 2011-06-13 17:34:57 -04:00
Richard Alam
4291dce4ae - add timestamp on filename so it will be unique 2011-06-13 16:57:37 -04:00
Richard Alam
12c5b34cea - store start and stop webcam events by sending message from video app
instead of relying on status event
2011-06-13 14:32:07 -04:00
Richard Alam
82eaf9724c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-06-13 12:27:02 -04:00
Richard Alam
69da70736b - change build using gradle
- need to add jedis plugin so we can store the start/stop broadcast event
   as the webcam status event is unreliable and can introduce sync issues.
2011-06-13 12:25:18 -04:00
Localization Server
ca86fe1b77 Updating locale 2011-06-13 14:00:02 +00:00
Localization Server
70f2aadcbf Updating locale 2011-06-11 20:20:01 +00:00
Localization Server
5f2defc406 Updating locale 2011-06-11 19:00:02 +00:00
Richard Alam
cdc4e77ba1 - simple cleanup 2011-06-10 11:19:11 -04:00
Richard Alam
aa7a5a33a9 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-06-08 21:15:22 -04:00
Richard Alam
1af29981fd - move the rap core god conf into default god/conf 2011-06-08 21:14:52 -04:00
Fred Dixon
6bc82d4710 Changed version in index.html from 0.71a to 0.8-dev 2011-06-08 18:11:50 -07:00
Richard Alam
dfb6283e59 - don't prompt adding host to known_host 2011-06-08 20:28:12 -04:00
Richard Alam
f14085a487 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-06-08 19:40:54 -04:00