Commit Graph

336 Commits

Author SHA1 Message Date
Richard Alam
4b9bf799cd - modify copyright 2013-04-19 21:31:32 +00:00
Fred Dixon
47a4d72c13 Removed second HRule for the Audio Settings Dialog 2013-04-13 09:02:28 -07:00
Chad Pilkey
d5e955c2a8 Merge remote branch 'upstream/master' into imp-muteme-button 2013-04-11 10:48:07 -07:00
Richard Alam
68b522803d - Add button to test microphone 2013-04-10 21:02:04 +00:00
Richard Alam
3fef459a19 - simplify audio settings 2013-04-10 18:45:08 +00:00
Chad Pilkey
0617d847ea switched strings to locale strings, unlocked is now only shown to moderators 2013-04-08 13:26:12 -07:00
Chad Pilkey
66e7f0bb98 more misc fixes 2013-04-04 12:04:05 -07:00
Chad Pilkey
2b5f91d170 pushing before fire alarm 2013-04-02 13:15:08 -07:00
Chad Pilkey
00479ecd4b reverted to just locking enabled 2013-04-02 10:03:47 -07:00
Richard Alam
60b3586024 Merge pull request #110 from SenecaCDOT-BigBlueButton/fix-camera-settings-popup
fixed camera settings resolution and a tooltip
2013-03-19 12:21:14 -07:00
Chad Pilkey
795df0761b fixed camera settings resolution and a tooltip 2013-03-19 13:08:27 -04:00
Chad Pilkey
8f164d3e23 added images when buttons are disabled in the users window and button images swap on mouse over 2013-03-18 19:08:30 -04:00
Chad Pilkey
df557b89af changed all internal references to participants to users 2013-03-15 18:53:39 -04:00
Chad Pilkey
af7e8c5bc4 Merge remote branch 'upstream/master' into more-client-fixes
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/ParticipantsWindow.mxml
2013-03-12 18:17:01 -04:00
Markos Calderon
d3c303776e added localization strings for participants module 2013-03-12 16:02:35 -05:00
Markos Calderon
34616c04d8 Merge branch 'layout-module' of https://github.com/mconf/bigbluebutton into mconf-layout-module
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMap.mxml
2013-03-08 17:04:02 -05:00
Chad Pilkey
f79de237de fixed a lot of issues with accessibility 2013-03-01 20:00:33 -05:00
Richard Alam
c24cf55d9c Merge branch 'master' into unify-users-and-listeners
Conflicts:
	bigbluebutton-client/build.xml
2013-02-19 21:31:56 +00:00
Chad Pilkey
8702b42def Merge remote branch 'upstream/master' into access-hotfix
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/viewers/views/ViewersWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
2013-02-19 13:45:50 -05:00
Richard Alam
43cba65f6d Merge branch 'poll-access' into merge-master-into-polling-module
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollingStatsWindow.mxml
2013-02-05 16:21:54 +00:00
jtrobinson
1079f128f0 Fixed conflicts; merging 2013-02-04 19:51:48 +00:00
Richard Alam
93311e6464 Merge branch 'master' into merge-master-into-polling-module
Conflicts:
	bigbluebutton-client/build.xml
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/src/BigBlueButton.mxml
2013-02-04 19:34:23 +00:00
jtrobinson
a3c5a13433 Pulled in upstream changes; now there's a crazy focus bug. Trying to figure that out. 2013-02-04 18:43:27 +00:00
Chad Pilkey
875df8ca30 all strings are now localised 2013-02-01 17:51:09 -05:00
Chad Pilkey
be11b4415b started implementing accessibility 2013-02-01 14:49:51 -05:00
Richard Alam
9a03f4ba71 Merge branch 'master' into style-presentation-upload-window 2013-02-01 19:06:20 +00:00
Markos Calderon
ab62b91a55 Merge remote-tracking branch 'bikramac/patch-3' 2013-02-01 10:45:02 -05:00
jtrobinson
ce400043ac Made accessibility descriptions for Viewer and User lists more clear 2013-01-31 20:08:30 +00:00
Markos Calderon
4d27998866 Adding branding for webcam preview 2013-01-30 18:05:02 -05:00
Chad Pilkey
6cc5776fa4 started moving all strings to locale file 2013-01-29 18:05:12 -05:00
jtrobinson
e6f38b17a4 Almost done tweaking Chat screen-reader logic to fit new Chat architecture. 2013-01-28 20:57:13 +00:00
Richard Alam
f1bea8d3c8 - style mic settings 2013-01-20 16:41:05 +00:00
Richard Alam
cceb6986e7 - style fileupload window 2013-01-21 22:03:11 +00:00
Markos Calderon
a2a6ea643a Update bigbluebutton-client/locale/en_US/bbbResources.properties 2013-01-18 16:17:22 -05:00
jtrobinson
651dfce09f Merge branch 'access-hotfix' of github.com:capilkey/bigbluebutton into access-hotfix 2013-01-10 19:46:15 +00:00
jtrobinson
444b7f4382 Merging in hotkeys with upstream build 2013-01-10 19:46:08 +00:00
Chad Pilkey
6e002d966e Merge remote branch 'origin/master' into access-hotfix
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
2013-01-08 14:00:46 -05:00
jtrobinson
b8875cb0d8 Small updates to chat keys 2013-01-07 19:42:58 +00:00
jtrobinson
c10b348831 Chatbox navigation hotkeys modified to fit new specifications 2013-01-07 18:41:09 +00:00
jtrobinson
9aa8724040 Chat Window hotkeys work; on to Chat Message Box keys 2013-01-04 21:05:52 +00:00
Felipe Cecagno
166673e196 translated specific strings to pt_BR 2013-01-04 17:11:35 -02:00
jtrobinson
31597b6f75 Another hotkey, and merging in upstream changes 2013-01-04 19:04:48 +00:00
jtrobinson
16164068d5 Merge branch 'access-hotfix' of github.com:capilkey/bigbluebutton into access-hotfix 2013-01-04 16:32:48 +00:00
jtrobinson
4488dd86bf More shortcuts, locale strings 2013-01-04 16:32:41 +00:00
Chad Pilkey
a650b83392 fixing merge 2013-01-03 17:53:47 -05:00
Chad Pilkey
ced7f51152 hiding window contents on minimize 2013-01-03 17:50:40 -05:00
Richard Alam
a4d453a3b7 - externalize strings to locale 2013-01-02 14:07:19 +00:00
jtrobinson
8895d64692 Added hotkeys for every button in Presentation module (no Whiteboard yet) that are only active in the Presentation scope (window must be focused) 2012-12-21 16:03:53 +00:00
jtrobinson
bb9d3979b4 Starting in on Presentation-scope hotkeys; just laid the groundwork 2012-12-20 21:28:58 +00:00
jtrobinson
a7277c7346 Added hotkeys to open shortcut help window, logout of meeting, and raise hand in viewer's list 2012-12-20 19:09:40 +00:00