Commit Graph

5915 Commits

Author SHA1 Message Date
jtrobinson
aa16db56c4 Updated DataGrid for Presenter-side poll results 2013-06-03 09:53:13 -07:00
Richard Alam
d25ec67d85 Merge branch 'master' into modify-esl-startup 2013-05-19 20:48:04 +00:00
Richard Alam
95dd42fb12 - modify ESL connect startup so that it will continue to try to register with ESL 2013-05-19 20:46:20 +00:00
Richard Alam
b378cab70a - simplify handling and sending of events 2013-05-19 04:39:41 +00:00
Richard Alam
b953886ac6 - subscribe to events 2013-05-19 03:54:31 +00:00
Richard Alam
0644711933 - minor formatting changes 2013-05-19 03:53:53 +00:00
Richard Alam
1295155737 - use version 3.2 of netty 2013-05-19 03:53:15 +00:00
Richard Alam
f07d472012 - upgrade esl jar versions 2013-05-19 03:04:34 +00:00
Richard Alam
6d8971eda8 - monitor connection every second and connect if not connected 2013-05-19 02:11:30 +00:00
Richard Alam
b37261733e - change esl connection 2013-05-19 01:42:45 +00:00
Richard Alam
2800c4f603 - upgrade to red5 r4643 2013-05-18 21:39:53 +00:00
Richard Alam
385ed17dd2 Merge pull request #158 from SenecaCDOT-BigBlueButton/fix-panning
Fix for the broken whiteboard toolbar
2013-05-17 14:29:44 -07:00
Chad Pilkey
c9bb5aa985 removed the whiteboard button code 2013-05-17 14:26:08 -07:00
Chad Pilkey
96355ebf56 accidentally broke the whiteboard toolbar, it is fixed now 2013-05-17 13:39:31 -07:00
Richard Alam
ffe7e7dcf5 Merge pull request #157 from kepstin/recording-fixups
More Recording fixups
2013-05-17 11:44:37 -07:00
Calvin Walton
80ceefa5ca presentation: Fix presentations which are images not pdfs
This was broken by my earlier change to fallback the pdf filename for
really old recordings.

Rearrange the code so that the pdf logic is only used in the case when
the presentation is a pdf.
2013-05-17 14:32:14 -04:00
Calvin Walton
366d5901a4 presentation: Support processing 0.80 rectangles and ellipses. 2013-05-17 14:29:49 -04:00
Richard Alam
91e60f6180 - double check if the user has left the meeting before opening an avatar icon when closing the video view window 2013-05-17 17:57:34 +00:00
Richard Alam
f45503d3c2 Merge pull request #155 from SenecaCDOT-BigBlueButton/fix-panning
Fix panning
2013-05-16 14:36:06 -07:00
Chad Pilkey
8f716fe33f change the thumbnail index when the slide changes 2013-05-16 14:25:57 -07:00
Chad Pilkey
24d15d74ec removing a file 2013-05-16 14:18:17 -07:00
Chad Pilkey
00a87a50e8 removed everything related to the old whiteboard toolbar button 2013-05-16 14:17:33 -07:00
Richard Alam
20c39ea109 - upgrade to the applet with fix for java block popup when stopping deskshare
- generate an unsigned applet so other can sign using their own cert
2013-05-16 20:10:33 +00:00
Richard Alam
c5ac5e1791 - generate an unsigned jar and a signed jar. Others can get their own certificate and sign their own jar file. 2013-05-16 20:06:19 +00:00
Richard Alam
60c0cdf11d Merge pull request #154 from SenecaCDOT-BigBlueButton/chat-hotkey-focus-fix
Only one Chat hotkey needed changing to incorporate focus.
2013-05-16 12:42:07 -07:00
jtrobinson
05b3f49a8a Only one Chat hotkey needed changing to incorporate focus. 2013-05-16 11:49:07 -07:00
Richard Alam
2511c51272 Merge pull request #153 from SenecaCDOT-BigBlueButton/pres-hotkey-focus-fix
Pres hotkey focus fix
2013-05-16 11:36:35 -07:00
jtrobinson
4d9f82fe4f Fixed focus and permission bugs for the remaining Presentation hot keys (Next and Previous, Slide selection, Fit to Width/Page) all at once. 2013-05-16 11:10:46 -07:00
jtrobinson
6b79780d38 Focus moves to Upload Presentation button when the relevant hotkey is used. Also fixed a small permission error in the same function. 2013-05-16 10:46:56 -07:00
Fred Dixon
00d7a7c06f Merge pull request #151 from SenecaCDOT-BigBlueButton/fix-whiteboard-buttons-deselecting
whiteboard tools now stay selected after hitting undo
2013-05-15 11:09:24 -07:00
Chad Pilkey
fb2ae2ab2a whiteboard tools now stay selected after hitting undo 2013-05-15 10:17:17 -07:00
Chad Pilkey
41b11581e5 increased the rowCount of the layout combobox to 10 2013-05-15 09:56:35 -07:00
Chad Pilkey
9c05911749 missed a listeners file as well 2013-05-15 09:46:00 -07:00
Chad Pilkey
3a6a3f92fe Merge pull request #150 from SenecaCDOT-BigBlueButton/missed-a-viewers-file
missed a file while removing viewers
2013-05-15 08:06:33 -07:00
Chad Pilkey
bfdefeff8d missed a file while removing viewers 2013-05-15 08:05:46 -07:00
Fred Dixon
355334a6c5 Adjusted the logout icon for better fit in button 2013-05-14 21:03:51 -04:00
Fred Dixon
a9f0650c15 Merge pull request #148 from SenecaCDOT-BigBlueButton/even-more-client-fixes
Even more client fixes
2013-05-14 15:58:48 -07:00
Chad Pilkey
27ecbcebeb mutemebutton mouse over text strings are now fixed 2013-05-14 15:56:07 -07:00
Chad Pilkey
4adb843005 changed logout button to an icon 2013-05-14 15:42:59 -07:00
Chad Pilkey
f4e57188ed help button changed to question mark 2013-05-14 14:28:25 -07:00
Chad Pilkey
8618c758a8 Merge pull request #147 from SenecaCDOT-BigBlueButton/hide-lock-icon-more-often
lock icon now only visible when locked
2013-05-14 12:45:14 -07:00
Chad Pilkey
4667c0c56a lock icon now only visible when locked 2013-05-14 12:38:32 -07:00
Richard Alam
ddce270398 Merge pull request #146 from SenecaCDOT-BigBlueButton/remove-viewers-and-listeners
Remove viewers and listeners
2013-05-14 12:18:31 -07:00
Chad Pilkey
0881bf052c removed locale strings for viewers and listeners 2013-05-14 12:10:53 -07:00
Richard Alam
24c4103e3a Merge pull request #145 from SenecaCDOT-BigBlueButton/focus-after-audio-2
Focus moves to the 'start' of the BigBlueButton window when user leaves ...
2013-05-14 12:06:15 -07:00
jtrobinson
bf8ea046d3 Focus moves to the 'start' of the BigBlueButton window when user leaves Audio Settings. 2013-05-14 11:52:20 -07:00
Richard Alam
1a3d12c78b Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-05-14 18:48:09 +00:00
Richard Alam
42afda8f5c - upgrade to red5 r4641 2013-05-14 18:47:23 +00:00
Chad Pilkey
e785e80629 viewers and listeners modules wiped from record 2013-05-14 11:40:21 -07:00
Richard Alam
1c4e3306cc Merge pull request #144 from kepstin/recording-fixups
Recording fixups
2013-05-14 11:18:43 -07:00