Commit Graph

5849 Commits

Author SHA1 Message Date
Richard Alam
6ea934b7f1 - fix regexp matching for voice userid 2013-05-29 20:35:07 +00:00
Richard Alam
4bdc8b90ab - display presenter icon for moderators who is not presenter 2013-05-29 18:32:52 +00:00
Richard Alam
c8f1a89e7a - notify 3rd-party apps when a user has been kicked out passing the userID 2013-05-29 16:06:02 +00:00
Richard Alam
19d8cb4ddd - allow removing of close button from config.xml 2013-05-28 17:15:12 +00:00
Richard Alam
11f41b8d70 Revert " - allow removing of close button for avatar and publish window through config.xml"
This reverts commit 961626f46a.
2013-05-28 16:24:54 +00:00
Richard Alam
dd6358cf92 - reset videoHolder dimensions and position to display properly when user publish,stop, then publish webcam 2013-05-28 16:19:38 +00:00
Richard Alam
961626f46a - allow removing of close button for avatar and publish window through config.xml 2013-05-28 16:18:48 +00:00
Markos Calderon
ffbabcf51d remove and add strings for the localization file 2013-05-27 17:56:48 -05:00
Fred Dixon
bac46b09ef Slight refactoring of getJoinURLwithDynamicConfigXML() to make consistent with other functions in bbb_api.jsp 2013-05-26 11:09:13 -07:00
Richard Alam
a2846271a2 - fixed problem where senders message gets displayed on all tabs in his private chat message window 2013-05-25 20:54:03 +00:00
Richard Alam
8afdc50c9b Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-05-25 19:56:23 +00:00
Richard Alam
a1d4a65cb0 - display avatar on webcam standalone app 2013-05-25 19:54:43 +00:00
Richard Alam
af0c56c131 updating api version to 0.81 2013-05-25 16:31:33 -03:00
Richard Alam
5b413bd7bc Merge branch 'master' into add-avatar-to-stadalone-webcam-app 2013-05-25 18:28:28 +00:00
Richard Alam
ca043014cb - we're not actually changing any settings but only the camera 2013-05-25 18:10:20 +00:00
Richard Alam
2bc04cad36 - minor cleanup 2013-05-25 18:04:57 +00:00
Richard Alam
fb56c6c886 - change how we display webcam setting popup into more like the mic settings 2013-05-25 18:04:30 +00:00
Richard Alam
c1794c1839 - use help url in config.xml 2013-05-25 17:06:22 +00:00
Richard Alam
e74bcbb5a4 - start putting avatar into webcam standalone apps 2013-05-25 15:55:13 +00:00
Markos Calderon
71d4f184be Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-05-24 19:59:47 -05:00
Markos Calderon
886772658e add instructions for check the usage of localization strings 2013-05-24 19:59:39 -05:00
Richard Alam
0c1af90eb3 Merge pull request #164 from SenecaCDOT-BigBlueButton/hotkey-cleanup
Hotkey cleanup
2013-05-24 15:49:37 -07:00
Richard Alam
4b6f5e50f4 Merge pull request #165 from SenecaCDOT-BigBlueButton/fix-private-message-size
private chat tabs now adjust to the current font size when opened
2013-05-24 15:48:07 -07:00
Chad Pilkey
b1933b7ee9 private chat tabs now adjust to the current font size when opened 2013-05-24 15:03:08 -07:00
jtrobinson
dd3e9e71d0 Added global hotkey to mute all users but the Presenter. 2013-05-24 13:30:38 -07:00
jtrobinson
a151565386 Updated the keys used for certain hotkey functions. 2013-05-24 09:52:42 -07:00
jtrobinson
05eb40a0af Commented out the Kick User line from Shortcut Help Window, since it is currently inactive. 2013-05-24 09:52:06 -07:00
jtrobinson
f35ffbfb13 Commented out the Focus Colour Picker line from Shortcut Help Window, since the Colour Picker component has been removed. 2013-05-24 09:47:23 -07:00
jtrobinson
8c96b8bd4a Commented out the Undo Whiteboard Mark line from Shortcut Help Window, since it is currently inactive. 2013-05-24 09:44:40 -07:00
Richard Alam
03faf8bb2c - remove maximize button on video windows 2013-05-24 16:04:35 +00:00
Richard Alam
b28cb66f32 - change how we create the base string and calculate checksum for setConfigXML API 2013-05-24 15:11:36 +00:00
Richard Alam
ac06f9fe3e Merge pull request #163 from SenecaCDOT-BigBlueButton/better-hotkey-modifiers
Better hotkey modifiers
2013-05-23 11:44:36 -07:00
jtrobinson
7fd4a04080 Improved the global/local logic by eliminating loadGlobalKeys() and merging the functionality into loadKeys(). Also made a shortcut function string more clear. 2013-05-23 11:34:24 -07:00
Chad Pilkey
821dee1cb2 Merge pull request #162 from SenecaCDOT-BigBlueButton/add-help-link-tooltip
added tooltip to help link
2013-05-23 11:25:59 -07:00
Chad Pilkey
ec1c615734 added tooltip to help link 2013-05-23 11:24:07 -07:00
jtrobinson
9c8c679a16 Added separation between global hotkeys and local-to-module hotkeys. Also changed hotkey modifiers to more favourable combinations. 2013-05-23 11:14:50 -07:00
Richard Alam
3e33bcc2d7 - stop sending video streams to red5 when the user logsout 2013-05-22 16:28:31 +00:00
Chad Pilkey
e839504987 Merge pull request #160 from SenecaCDOT-BigBlueButton/fix-sorting
user list alpha sorting is now ascending instead of descending
2013-05-21 14:51:57 -07:00
Chad Pilkey
abc535191d user list alpha sorting is now ascending instead of descending 2013-05-21 14:51:04 -07:00
Fred Dixon
02e6e0f667 Fixed tooltip for mute button 2013-05-19 18:11:59 -07:00
Fred Dixon
4af527f40b Revert to old fit-to-page button 2013-05-19 17:32:20 -07:00
Fred Dixon
a7390ba8d8 Tweaks to fit-to-page button 2013-05-19 17:21:51 -07:00
Fred Dixon
be1e5ca5a0 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-05-19 17:18:12 -07:00
Fred Dixon
ca93488d7d Slight tweak to the fit-to-page icon for presenter 2013-05-19 17:18:03 -07: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