Commit Graph

6097 Commits

Author SHA1 Message Date
Chad Pilkey
58e6ecbee1 Merge pull request #187 from SenecaCDOT-BigBlueButton/notification-hotfix
Timer removed until a more effective notification procedure is developed...
2013-06-21 07:55:36 -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
Gustavo Salazar
d63fbac298 Create missing start events for webcam streams fix #1561 2013-06-20 15:45:26 -05: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
Gustavo Salazar
1bb53e71f9 Merge pull request #186 from fcecagno/playback-improvements
Presentation playback improvements
2013-06-19 17:48:59 -07:00
Leonardo Crauss Daronco
c6da73272b Hide unnecessary scroll bars in the playback html 2013-06-19 17:22:07 -03:00
Felipe Cecagno
e53ea59abe Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into playback-improvements 2013-06-19 12:44:38 -03:00
Felipe Cecagno
68db2b5fdc Merge branch 'playback-improvements' of github.com:fcecagno/bigbluebutton into playback-improvements 2013-06-19 12:21:01 -03:00
Felipe Cecagno
6e38af8db6 Merge pull request #2 from daronco/playback-improvements
Fix the position of media controls in the playback with video
2013-06-19 08:20:14 -07:00
Leonardo Crauss Daronco
ab73b54fb3 Fix position of elements in the playback after swapping video/presentation
The media controls area (acorn controls) was placed in the wrong position
after swapping video and presentation in the recording playback (and was
still wrong if swapping them again).
2013-06-18 23:19:08 -03:00
Felipe Cecagno
0551764df1 Merge branch 'playback-improvements' of github.com:daronco/bigbluebutton into playback-improvements 2013-06-18 15:53:58 -03: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
jtrobinson
cc3e376c6d Added local hotkeys back into Voting window. 2013-06-18 07:53:42 -07:00
Richard Alam
c4abeb827f - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1558 2013-06-18 10:47:30 -04:00
jtrobinson
70e5639483 Added local hotkeys to Polling Stats window 2013-06-18 06:52:01 -07:00
Leonardo Crauss Daronco
ce668c55b0 Fix the position of media controls in the playback with video
The media controls area (acorn controls) was being displayed at the
wrong place in the playback of a recording with video. Now it's always
displayed right below the presentation area, doesn't matter if the
recording has video or not.
2013-06-17 22:56:08 -03:00
Gustavo Salazar
9966c3fc61 fix url 2013-06-17 17:12:36 -05:00
jtrobinson
65f06c07ec Fixed local hotkeys in Instructions window. 2013-06-17 12:03:52 -07:00
jtrobinson
d2d8c58f77 Found the culprit: Missing handlers in the Event Map. 2013-06-17 11:52:36 -07:00
jtrobinson
aa3db37692 More hotkeys code. Hotkeys still not quite functional. 2013-06-17 11:26:42 -07:00
Felipe Cecagno
820001214c improving the rap deployment script 2013-06-17 14:35:23 -03:00
Felipe Cecagno
0e5866a3d2 Merge pull request #1 from daronco/playback-improvements
Reposition auto scroll option and audio bar in the playback html
2013-06-17 10:34:13 -07:00
Fred Dixon
70f26a27f2 Minor updates to welcome message 2013-06-16 07:19:32 -07:00
Fred Dixon
81988c2e68 Updated index.html page to read 0.81-beta 2013-06-16 06:59:08 -07:00
Leonardo Crauss Daronco
891ae0be49 Reposition auto scroll option and audio bar in the playback html
Audio control bar is bigger and aligns with the presentation. The auto scroll
checkbox is aligned with the thumbnails area.
2013-06-16 01:35:39 -03:00
Fred Dixon
e08c6802d4 Update configuration to record desktop sharing by default 2013-06-15 08:25:09 -07:00
Richard Alam
c9f8a8cc8b Merge pull request #208 from fcecagno/sync-playback
Sync playback
2013-07-13 18:17:14 -07:00
Felipe Cecagno
80a8792597 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into sync-playback 2013-07-12 22:23:52 -03:00
Chad Pilkey
130a51467b Merge pull request #207 from SenecaCDOT-BigBlueButton/move-you-to-locales
moved the you indicator in the users grid to the locales file
2013-07-12 15:34:57 -07:00
Chad Pilkey
5cfe26fae6 moved the you indicator in the users grid to the locales file 2013-07-12 15:30:53 -07:00
Chad Pilkey
b815e783fb Merge pull request #206 from SenecaCDOT-BigBlueButton/early-accessibility-fixes
Early accessibility fixes
2013-07-12 15:02:08 -07:00
Chad Pilkey
e73806e715 Merge remote branch 'upstream/master' into early-accessibility-fixes 2013-07-12 14:50:01 -07:00
Chad Pilkey
e3e2d098d0 Merge pull request #205 from SenecaCDOT-BigBlueButton/accessible-language
Accessible language
2013-07-12 14:49:04 -07:00
Chad Pilkey
f1126ba56f fixed the shorcut help window column headers 2013-07-12 14:48:24 -07:00
Chad Pilkey
3a815a4328 changed the join audio string 2013-07-12 14:29:11 -07:00
Chad Pilkey
77260b1bc2 turning off autoplay in the recording playback 2013-07-12 13:26:26 -07:00
Chad Pilkey
b564f7d591 moved the popup windows to the start of the tab order 2013-07-12 13:08:49 -07:00
jtrobinson
90487abca7 Replaced Shortcut Help datagrid headers with properly localized strings. 2013-07-11 13:46:57 -07:00
jtrobinson
a557a00822 Added accessibilityDescription to chat message input box 2013-07-11 13:33:21 -07:00
jtrobinson
bfe6b7023a Added accessibilityDescription to chat message input box 2013-07-11 13:33:03 -07:00
jtrobinson
953602481b Added user's name to button tooltips in Users window userlist 2013-07-11 13:30:32 -07:00
jtrobinson
b028d3b4ac Brought accessible language to Presentation title bar 2013-07-11 11:10:37 -07:00
jtrobinson
99071aac3b Finished tab names for public chat and options tab 2013-07-11 10:53:43 -07:00