Richard Alam
6cbfffea4a
Merge pull request #189 from SenecaCDOT-BigBlueButton/modular-hotkeys
...
Modular hotkeys
2013-06-26 10:54:32 -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
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
d05d2df02e
Updated release to 0.81-beta
2013-06-15 03:00:45 -07:00
Fred Dixon
4854934faf
Added --setsecret and --secret
2013-06-15 02:28:18 -07:00
Fred Dixon
37107430b7
Update API example to use setConfigXML, not setConfigXML.xml
2013-06-15 01:47:41 -07:00
Fred Dixon
5b963b5c58
Added --setsecret
2013-06-14 23:38:19 -07:00
Fred Dixon
e7af666fe9
Fixed https://code.google.com/p/bigbluebutton/issues/detail?id=1557
2013-06-14 22:39:57 -07:00
Richard Alam
340c7dabf0
Merge pull request #183 from SenecaCDOT-BigBlueButton/fix-meeting-title
...
the meeting name is now available inside the meeting
2013-06-14 09:33:03 -07:00
Chad Pilkey
14b79c762d
the meeting name is now available inside the meeting
2013-06-14 09:11:12 -07:00
jtrobinson
9d7c3e3888
Added necessary code back in to other files.
2013-06-14 08:22:12 -07:00
Richard Alam
b67c6762bc
Merge pull request #182 from fcecagno/disabling-network-monitor
...
Disabled temporarily the network monitor and the bandwidth measurement
2013-06-13 16:28:59 -07:00
Felipe Cecagno
ae7468f9de
disabling temporarily the network monitor and the bandwidth estimation measurement
2013-06-13 20:20:08 -03:00
jtrobinson
e4236a0e39
Added logic to support global Poll Menu hotkey to Poll Event Map and Polling Manager
2013-06-13 11:45:00 -07:00
jtrobinson
c61638a04f
Added all locale strings for polling.
2013-06-13 11:14:46 -07:00
jtrobinson
abb9cabfb0
Added hotkeys to Voting window.
2013-06-13 10:45:43 -07:00
