Commit Graph

3001 Commits

Author SHA1 Message Date
jtrobinson
49752b56a2 Resolved conflicts 2013-07-15 09:16:50 -07:00
jtrobinson
710530f59f Repairing some errors that came up in conflict resolution. 2013-07-15 07:25:52 -07:00
jtrobinson
4397154648 Resolved conflicts. 2013-07-15 07:21:39 -07:00
jtrobinson
165f18fa4f Notifications in chatTabs are not working. This bears returning to later. 2013-07-11 08:05:54 -07:00
jtrobinson
3128350bfb Merged upstream/master, resolved conflicts. 2013-07-10 09:48:03 -07:00
jtrobinson
40f5528d10 Still experimenting with ChatTabs accessibility. 2013-07-10 07:20:55 -07:00
Chad Pilkey
7137eaf189 place the whiteboard toolbar on the top when the presentation window is clicked 2013-07-09 14:36:02 -07:00
Richard Alam
56c6e32ed7 Merge pull request #199 from SenecaCDOT-BigBlueButton/add-keeptoolbarvisible-property
Add keeptoolbarvisible property
2013-07-09 10:33:46 -07:00
Chad Pilkey
532b9f50c9 cleaned up a missing return type 2013-07-09 10:11:10 -07:00
Chad Pilkey
ce3993a6af added a property keepToolbarVisible to the Whiteboard Module 2013-07-09 09:59:37 -07:00
Richard Alam
8269de8c44 Merge pull request #198 from SenecaCDOT-BigBlueButton/modify-page-title
Modify page title
2013-07-08 10:17:28 -07:00
Chad Pilkey
06a279ba2f added meeting title to the client html document title 2013-07-08 09:46:23 -07:00
Chad Pilkey
0e69428914 fixed a race condition with the shortcut options 2013-07-08 09:44:31 -07:00
Chad Pilkey
95868fc98d reworked the meeting name in the toolbar 2013-07-05 11:53:02 -07:00
Chad Pilkey
7bafd045e1 chat notification blinker is removed 2013-07-04 15:21:25 -07:00
Markos Calderon
5ed910cde5 Updating localization files 2013-07-04 12:18:57 -05:00
Richard Alam
ec87a3393b Merge pull request #195 from SenecaCDOT-BigBlueButton/fix-audio-security-dialog
Fix audio security dialog
2013-07-03 18:21:02 -07:00
Chad Pilkey
a10aaf5582 cleaning up log messages 2013-07-03 16:07:52 -07:00
Chad Pilkey
eb74f1fd54 cleaned up the way mic permissions work to handle Flash being in protected mode 2013-07-03 16:07:33 -07:00
jtrobinson
dd06dd16e7 Chat tabs now modify their accessibility description to tell a screen reader whether there are new messages in that tab or not. Removed logic pertaining to ChatAccessibilityEvent, which was introduced as part of this branch and is no longer needed. 2013-07-02 09:08:15 -07:00
Richard Alam
8c656f0a2d Merge pull request #193 from SenecaCDOT-BigBlueButton/fix-whiteboard-marks
fixed the ghost whiteboard objects
2013-06-28 14:55:57 -07:00
Chad Pilkey
b930bb30cb added a room mute indicator to the users window 2013-06-27 13:57:06 -07:00
jtrobinson
1253ebcb17 Removed commented code pertaining to the old timer-based notification system. 2013-06-27 09:36:18 -07:00
jtrobinson
e9a865cb0e Added logic to determine whether or not to play the notification sound. Sound now plays whenever a message is received, like many other chat clients. 2013-06-27 09:33:42 -07:00
jtrobinson
db61f9d312 Added new chat message notification noise and licensing information for the sound file. Removed old public and private notification sounds and the relevant code. Commented out code from the old timed notifications. 2013-06-27 07:38:00 -07:00
Chad Pilkey
6ba928924f fixed the ghost whiteboard objects 2013-06-26 16:42:16 -07:00
Richard Alam
4415a72825 Merge pull request #191 from SenecaCDOT-BigBlueButton/fix-https-links
fixed https chat linking
2013-06-26 10:55:12 -07:00
Richard Alam
19dfb6f884 Merge pull request #190 from SenecaCDOT-BigBlueButton/chat-access-hotfix
Chat access hotfix
2013-06-26 10:54:52 -07:00
Richard Alam
6cbfffea4a Merge pull request #189 from SenecaCDOT-BigBlueButton/modular-hotkeys
Modular hotkeys
2013-06-26 10:54:32 -07:00
jtrobinson
72361ed21c Removed notification timer from ChatView 2013-06-25 13:20:12 -07:00
Chad Pilkey
16aa23e01a fixed https chat linking 2013-06-25 13:19:24 -07:00
jtrobinson
0a8b8cc91f Changed hotkey for Repeat Current Message to the Spacebar. 2013-06-25 12:40:02 -07:00
jtrobinson
55168dc935 Improved 'Repeat Current Message' functionality for repeating the Welcome message before any other navigation happens (an edge case, but an easy one to address) 2013-06-25 12:00:31 -07:00
jtrobinson
a330e1f85b Improved Chat Box navigation logic and initial accessibility description. 2013-06-25 11:32:35 -07:00
jtrobinson
1fecc7130f Localized some special-case strings being used in Shortcut Window. 2013-06-25 07:36:31 -07:00
jtrobinson
306e82406f Changed ChatBox.mxml to use the arrow keys to navigate chat messages. 2013-06-24 13:13:58 -07:00
jtrobinson
7ecb6ab1e7 Moved global hotkey resource array to static member in ShortcutOptions. 2013-06-24 08:30:05 -07:00
jtrobinson
d97102015b Shortcut window correctly displays/hides hotkeys depending on what modules are and are not included. 2013-06-24 07:49:52 -07:00
Markos Calderon
2f7c2949c5 fix locale 2013-06-21 16:41:00 -05:00
Chad Pilkey
390630d269 Merge pull request #152 from SenecaCDOT-BigBlueButton/global-hotkey-focus-fix
Global hotkey focus fix
2013-06-21 07:56:46 -07:00
jtrobinson
747a6be5c0 Timer removed until a more effective notification procedure is developed. 2013-06-21 07:53:43 -07:00
jtrobinson
19fed749b1 Need to test this code still, pushing so I can make a hotfix in another branch. 2013-06-21 07:51:19 -07:00
jtrobinson
4da8a1c12a Trying to dynamically populate the SHW drop-down list. Committing work in order to address another issue. 2013-06-20 07:33:38 -07:00
jtrobinson
479678316f BigBlueButton.mxml now only loads hotkeys for use based on which modules are loaded or not. 2013-06-18 11:38:31 -07:00
jtrobinson
bd8aa63c98 Merged upstream changes and polling hotkeys 2013-06-18 11:17:45 -07:00
jtrobinson
dfa208aa78 Global hotkeys in Shortcut Help Window are now displayed based on which modules are and aren't loaded. 2013-06-18 11:10:54 -07:00
jtrobinson
4b9cd35eb7 Made members of ShortcutOptions static so that it only needs to be loaded once in BigBlueButton.mxml. You can't change the config mid-meeting, after all. 2013-06-18 10:49:46 -07:00
jtrobinson
044ac80303 ShortcutOptions detects whether any modules are missing or commented out from config.xml 2013-06-18 09:50:36 -07:00
jtrobinson
f4162fb652 Created ShortcutOptions class to allow modular loading of hotkeys. 2013-06-18 08:40:37 -07:00
Richard Alam
2eca78d600 Merge pull request #185 from SenecaCDOT-BigBlueButton/poll-hotkeys-64
Poll hotkeys
2013-06-18 08:40:36 -07:00