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

4695 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chad Pilkey
14b7b5500f Merge remote branch 'upstream/master' 2012-09-24 19:01:04 +00:00
Gustavo Salazar
b9e79208c5 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-09-21 17:28:11 -05:00
Gustavo Salazar
2462802d54 Change ffmpeg commands to support version 0.11.2 2012-09-21 17:27:11 -05:00
Chad Pilkey
97bfcbb068 Merge remote branch 'upstream/master' 
Conflicts:
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/BigBlueButton.mxml
	record-and-playback/presentation/playback/presentation/css/bbb.playback.css
	record-and-playback/presentation/playback/presentation/playback.html
	record-and-playback/presentation/playback/presentation/playback.js
 2012-09-21 21:27:23 +00:00
Richard Alam
fc294df41f Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-09-21 21:06:51 +00:00
Richard Alam
80744c488f - continue drawing when the mouse temporarily moves out of the canvas 2012-09-21 21:06:11 +00:00
Markos Calderon
c878ff5d06 added redirect and clientURL parameters to the API 2012-09-21 16:03:53 -05:00
Richard Alam
80204543e8 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-09-21 20:44:39 +00:00
Richard Alam
2b71f9f964 - fix history for latecomers 2012-09-21 20:44:15 +00:00
Gustavo Salazar
f8510d749b Always set a value to "title" in dublincore.xml 2012-09-21 15:22:23 -05:00
Richard Alam
d3ff17ab05 - extract bbb-api-bridge into it's own js file 2012-09-20 16:17:57 +00:00
Chad Pilkey
a787c7c2c3 trying to implement accessibility pauses 2012-09-17 16:31:28 +00:00
Gustavo Salazar
b0cb319bf1 Set width to chat container 2012-09-16 14:38:18 -05:00
Richard Alam
785c4ddd45 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-09-12 06:30:50 +00:00
Gustavo Salazar
e2fbbef7de Remove dependency on slides scripts 2012-09-15 21:27:10 -05:00
Gustavo Salazar
79b9cf1cab Validate bounds in cursor events 2012-09-15 20:42:31 -05:00
Gustavo Salazar
5067940818 Validate bounds before drawing cursor 2012-09-15 20:40:23 -05:00
Richard Alam
75e8542491 - check if mouse cursor is outside presentation window 2012-09-12 06:30:25 +00:00
Richard Alam
a9f1a1bb12 - increase timer timeout as it obstructs clicking other buttons 2012-09-11 19:08:04 +00:00
Richard Alam
1240723b99 - forgot to add /fcs/ handler 2012-09-14 19:32:50 +00:00
Richard Alam
6ea4b78f72 - fix problem where only one user is able to join the voice conf. We are renaming the sip context which makes 
red5 not find it
 2012-09-14 15:15:11 +00:00
Richard Alam
7aef1052f3 - call netstream.close() to stop the stream. Calling netstream.play(false) makes red5 look for a file to stream 2012-09-14 15:13:58 +00:00
Richard Alam
239744713a - call super methods of Red5 application adapter 2012-09-14 15:13:29 +00:00
Richard Alam
ad35b2ab08 - upgrade to red5 r4415 2012-09-12 20:39:34 +00:00
Richard Alam
a01b9df615 Merge remote branch 'origin/master' into upgrading-red5-r4415 2012-09-12 20:32:06 +00:00
Richard Alam
96cb775d30 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-09-12 20:27:34 +00:00
Richard Alam
58d3c90db1 - fix hardcoded locale location 2012-09-12 20:26:37 +00:00
Fred Dixon
f4fff9160c Also update hostname for metadata.xml in /var/bigbluebutton/published ... 2012-09-12 15:14:45 -04:00
Fred Dixon
11520ab392 bbb-conf --setip now updates the hostname for playback of recordings in metadata.xml 2012-09-12 14:53:21 -04:00
Fred Dixon
4b79d140ba bbb-record --check now checks if the IP address for a recording matches the value defined in bigbluebutton.properties 2012-09-12 14:52:36 -04:00
Richard Alam
48976c86db Merge branch 'master' into merge-master-with-upgrading-red5-r4406 2012-09-12 17:19:30 +00:00
Richard Alam
10189eccf9 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-09-12 16:05:20 +00:00
Richard Alam
870bd93013 - move bbb-api-bridge into it's onwn js file 
- rename the api method names
 - cleanup
 2012-09-12 16:00:38 +00:00
Richard Alam
8ac96a7a3c - change config.xml template to have full URL of SWF files 2012-09-12 15:33:03 +00:00
Richard Alam
781a03a149 Merge branch 'master' into merge-master-into-embedding-client 2012-09-12 15:19:30 +00:00
Gustavo Salazar
9b03ac4292 Use playerglobal 11.2 instead of 10.3 when setting development environment 2012-09-12 09:19:48 -05:00
Fred Dixon
f39eed5dfe reverted changes to bbb-conf 2012-09-11 18:45:16 -04:00
Fred Dixon
7bad4ffab8 Also delete sanity recordings in bbb-record --deleteall 2012-09-11 18:41:32 -04:00
Richard Alam
886f62337b - qeury for server name so we can determine where to load locales.xml, config.xml, etc. 2012-09-11 21:51:27 +00:00
Richard Alam
17dc1fbde4 - cut down amount of whiteboard data by 2/3 2012-09-11 19:29:26 +00:00
Richard Alam
8825dc71ab Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-09-11 17:50:46 +00:00
Richard Alam
705ac86d2b - throttle mouse cursor updates in presentation window 2012-09-11 17:50:16 +00:00
gustavo salazar
2eef1f4664 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-09-10 16:12:49 -05:00
gustavo salazar
6d90e31b85 Set playback_host in bigbluebutton.yml 2012-09-10 16:12:10 -05:00
Fred Dixon
c57e7de14d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-09-10 16:22:58 -04:00
Fred Dixon
abce700f11 Merge pull request #62 from ryanseys/master 
Add bbb-html5-client to labs
 2012-09-10 13:21:47 -07:00
gustavo salazar
140376e084 "Audio" tag created in html. 2012-09-10 14:40:51 -05:00
Gustavo Salazar
6a8319ba9e Show chat when audio is played. 2012-09-07 17:21:00 -05:00
Fred Dixon
d3b694167f Modified bbb-conf to not require slides.yml 2012-09-07 16:45:31 -04:00
Ryan Seys
69e27955b3 Add bbb-html5-client to labs not as submodule 2012-09-07 15:02:21 -04:00