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

4725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chad Pilkey
3aaeb553b0 updated url rewrite filter jar 2012-10-11 20:39:49 +00:00
Chad Pilkey
ad519be5d7 adding in web polling 2012-10-11 15:44:40 +00:00
Chad Pilkey
1e813affd1 Merge remote branch 'origin/master' into poll-access 2012-10-11 14:57:32 +00:00
Chad Pilkey
9272fdfb6e removed empty file 2012-10-11 14:55:54 +00:00
Chad Pilkey
30f330b143 Merge remote branch 'origin/master' into poll-access 2012-10-09 17:34:20 +00:00
Chad Pilkey
abad84542d fixed new playback controls 2012-10-09 17:33:59 +00:00
Chad Pilkey
c3b7c064f4 Merge remote branch 'upstream/master' 2012-10-09 17:26:27 +00:00
Richard Alam
4d51be0f58 - fix double vertical scrollbars when the chat window becomes too narrow 2012-10-03 14:17:50 +00:00
Gustavo Salazar
51fe50a811 Do not play video file according to audio file. 2012-10-02 12:22:14 -05:00
Chad Pilkey
dea6a89dd0 Merge remote branch 'origin/master' into poll-access 2012-10-02 14:58:41 +00:00
jtrobinson
a4c47fd46a Syncing local ocal repo 2012-10-02 18:52:12 +00:00
Gustavo Salazar
487cf1b51f Align components in playback. 2012-10-02 09:58:27 -05:00
Markos Calderon
a72f91968b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into change-internaluserid 2012-10-01 16:41:45 -05:00
Markos Calderon
5dafac2b25 change long to string 2012-10-01 16:41:33 -05:00
Chad Pilkey
0a7ab07727 Merge remote branch 'upstream/master' 
Conflicts:
	record-and-playback/presentation/playback/presentation/playback.js
 2012-10-01 21:00:32 +00:00
Richard Alam
789b4b03b6 - missed a couple of new files 2012-10-01 17:28:50 +00:00
Richard Alam
5338c823c2 - use connection invoke instead of shared object when sending mouse cursor events in presentation 2012-10-01 15:44:54 +00:00
Gustavo Salazar
f3c8477b27 Fixed frame rate in mpg file 2012-09-28 11:52:35 -05:00
jtrobinson
f5a858e1c2 Solved duplicate voting window issue 2012-09-27 19:20:07 +00:00
jtrobinson
e7207a2e94 Focus issues aes are mostly resolved, but polling is currently not ready for use. 2012-09-27 16:36:05 +00:00
jtrobinson
f26dc9305a Some focus issues still present 2012-09-26 19:20:03 +00:00
Gustavo Salazar
aa3350115d Ask for ffmpeg version before using loop parameter. 2012-09-25 20:08:52 -05:00
Chad Pilkey
a7f3e5aec1 fixed polling module to work with new version of red5 2012-09-24 19:36:56 +00:00
Chad Pilkey
1557318b32 Merge remote branch 'origin/master' into poll-access 2012-09-24 19:01:36 +00:00
Chad Pilkey
14b7b5500f Merge remote branch 'upstream/master' 2012-09-24 19:01:04 +00:00
Chad Pilkey
f9b501f1f0 Merge remote branch 'origin/master' into poll-access 2012-09-24 15:16:02 +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
343be6d3e0 cleaned up the polling module a little 2012-09-19 21:07:36 +00:00
jtrobinson
7300228e29 Focus issues on Polling Instructions Window finally resolved through use of a Timer. 2012-09-19 17:27:42 +00:00
jtrobinson
64b83c4388 Pushing poll accessibility for visibility's sake; still lots of bugs 2012-09-17 19:08:33 +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