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

2075 Commits

Author SHA1 Message Date
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
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
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
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
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
80744c488f - continue drawing when the mouse temporarily moves out of the canvas 2012-09-21 21:06:11 +00: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
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
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
58d3c90db1 - fix hardcoded locale location 2012-09-12 20:26:37 +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
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
705ac86d2b - throttle mouse cursor updates in presentation window 2012-09-11 17:50:16 +00:00
Chad Pilkey
969824d29b Merge remote branch 'upstream/master' 2012-09-07 18:11:18 +00:00
Richard Alam
24b5d77de3 - align whiteboard icons 2012-09-07 14:29:22 +00:00
Chad Pilkey
008b3ccf35 Merge remote branch 'upstream/master' 2012-09-06 15:37:12 +00:00
Richard Alam
957948ae79 - fix stream names for video 2012-09-04 22:11:31 +00:00
Chad Pilkey
35704cbdb9 Merge remote branch 'upstream/master' 2012-09-03 23:46:13 +00:00
Markos Calderon
60854bc7fa added a temporary change for text tool in presentation 2012-08-29 16:35:16 -05:00
Fred Dixon
5feed6046f Applied Taigo's update for issue #1246 2012-08-29 14:45:37 -04:00
Gustavo Salazar
e404da9614 Disable h264 by default. 2012-08-27 18:08:29 -05:00
Richard Alam
0971eb9a58 - add example wrapper for loading flash client from different server 2012-08-24 21:32:17 +00:00
Richard Alam
75bd9a754f Merge branch 'master' into embedding-the-client 
Conflicts:
	bigbluebutton-client/resources/prod/BigBlueButton.html
 2012-08-24 21:25:21 +00:00
Richard Alam
72d97f9faf - load flash from an html on a different server 2012-08-24 19:22:26 +00:00
Fred Dixon
a253171ac8 Fix for issue http://code.google.com/p/bigbluebutton/issues/detail?id=1294 2012-08-24 13:43:01 -04:00
Richard Alam
414d3568f6 - see if we can callback from flash to javascript 2012-08-24 15:06:18 +00:00
Richard Alam
51e7b4a114 - remove typo 2012-08-24 14:45:54 +00:00
Richard Alam
8012c8f48f Merge branch 'master' into embedding-the-client 2012-08-24 14:09:32 +00:00
Richard Alam
809e16cc61 - fix tooltip 2012-08-23 22:00:20 +00:00
Richard Alam
ebf89cb65f Merge branch 'use-generated-userid' into merge-master-with-use-generated-userid 2012-08-23 21:31:30 +00:00
Richard Alam
62b92a825c - fix font size for late joiner 2012-08-23 21:29:54 +00:00
jtrobinson
2e2414c16e Selecting 'create new poll' automatically focuses on the first text input of the poll creation menu 2012-08-23 21:16:30 +00:00
Richard Alam
17734c404b - size the fonts properly...but problem with late joiner still 2012-08-23 21:12:46 +00:00
Richard Alam
aba57f70bd - fix assigning of presenter 2012-08-23 19:56:57 +00:00
Richard Alam
d9e5c80c6c - try generating userid instead of using red5 connection id as userid 2012-08-23 19:49:31 +00:00