BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,518 Commits 13 Branches 260 Tags 1.1 GiB
88be8696f8
Commit Graph

549 Commits

Author SHA1 Message Date
Richard Alam
262f94b69c Merge branch 'merge-polling-with-master' into broadcast-layout 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-06-06 15:34:35 -07:00
Chad Pilkey
632096fd64 the phone option is now somewhat configurable 2014-06-05 13:52:37 -07:00
Chad Pilkey
9b86798f21 cleaned up the file upload window and made it so that when you click the file name it will open the native file dialog 2014-06-04 11:47:24 -07:00
Chad Pilkey
344103922a moved the webrtc call failed alertbox text to locales 2014-06-03 13:14:05 -07:00
Chad Pilkey
f6cb040908 moved the audio selection window strings to the locale file 2014-06-03 09:00:41 -07:00
Richard Alam
04c271996d Merge branch 'broadcast-layout' of github.com:mconf/bigbluebutton into broadcast-layout 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutApp.scala
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/events/LayoutEvent.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/LayoutService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/MessageReceiver.as
 2014-05-29 11:21:01 -07:00
Felipe Cecagno
5821c32372 implemented the new button broadcast layout, which will send to all viewers the moderator's current layout; the lock button and broadcast button only affect viewers, not moderators 2014-05-29 12:19:40 -03:00
Richard Alam
e254787276 - add layout to lock settings 2014-05-28 12:25:28 -07:00
Richard Alam
068df39570 - add [Disabled] text beside feature name 2014-05-26 11:32:21 -07:00
Richard Alam
f266067e1a - display message to user when auth token is invalid 2014-05-21 18:42:49 +00:00
Felipe Cecagno
92eac1e988 Merge branch 'global-audio' into merge-global-audio 
Most of the client implementation is going to be rewritten on next commits.
 2014-04-23 16:13:40 -03:00
Richard Alam
214957e52c - localize text 2014-03-28 16:02:33 +00:00
Richard Alam
ac111de364 Merge remote branch 'bbb/v0.81-javau51-update' into merge-java-7u51-branch 2014-02-19 20:09:56 +00:00
Richard Alam
948e1b323e Merge branch 'master' into merge-polling-with-master 2014-02-12 15:59:23 -05:00
Chad Pilkey
e3b617225e Merge pull request #305 from syeshchenko/presentationWindowFix 
FileUploader window fixes
 2014-02-12 13:04:00 -05:00
Gustavo Salazar
339608c813 update message for not webrtc capable browser 2014-02-10 14:16:05 -08:00
Richard Alam
c77ddd76d3 Merge branch 'master' into merge-polling-with-master 2014-02-10 21:49:36 +00:00
Gustavo Salazar
edf9518a31 Merge master branch to add style in mic settings. 2014-02-10 11:03:15 -08:00
Gustavo Salazar
ea0c763712 Merged with https://github.com/mconf/bigbluebutton/tree/webrtc_support 2014-02-07 16:56:23 -08:00
Richard Alam
1430eff18d - update locales to show java7u51 2014-02-06 16:53:26 -05:00
syeshchenko
06bf0fe049 Add file format hint message 2014-02-05 11:01:23 -08:00
Chad Pilkey
d8bbfbfa36 moved the Mic Warning strings to the locale file and fixed up a bug with the chrome warning popup 2014-02-04 15:42:46 -08:00
Chad Pilkey
ecac0b7a1d fixed up the ui of the audio settings a little bit 2014-02-04 14:43:20 -08:00
Richard Alam
a6a58e6ecb - update java string to u51 2014-01-16 17:57:31 -05:00
Richard Alam
5559a2b8cc Merge branch 'master' into merge-polling-with-master 
- there are compile issues we need to fix

Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/ParticipantUpdatingRoomListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
 2014-01-23 20:49:04 +00:00
Felipe Cecagno
3070127a8e Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into record-button 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/participants/ParticipantsEventRecorder.java
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
 2014-01-15 17:53:10 -02:00
Tiago Daniel Jacobs
0679568656 Fixed copyright string in pt_BR 2014-01-14 23:51:44 -02:00
Felipe Cecagno
3440ed0fe3 Merge branch 'v0.81' into record-button 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
 2014-01-14 14:05:41 -02:00
Tiago Daniel Jacobs
8c912df459 Implemented lock settings in bbb-client and bbb-apps. 2014-01-09 03:52:03 -02:00
Richard Alam
329d2b9af1 Merge pull request #291 from SenecaCDOT-BigBlueButton/add-another-string 
created a new locale string for the chat module
 2013-10-31 17:44:00 -07:00
Chad Pilkey
336c8f72f3 created a new locale string for the chat module 2013-10-31 16:27:14 -07:00
Gustavo
9e61cc334a update locales 2013-10-30 20:53:29 +00:00
Richard Alam
c4855876c3 - change test java link 2013-10-21 21:50:38 +00:00
Richard Alam
de553549d1 - change instruction to much shorter one so it's easy to localize 2013-10-21 18:47:31 +00:00
Richard Alam
b07dde529c - add java version required notice in when starting desktop sharing 2013-10-21 18:09:00 +00:00
Richard Alam
9f8163d9b2 - localize poll toolbar button 2013-10-17 12:24:26 -07:00
Gustavo
805f93ec54 update locales and add welsh 2013-10-09 20:18:43 +00:00
Gustavo Salazar
8b18f4915f update italian translation strings 
0.8 is the default version set for all the "locales", with the value 0.81 it fails while loading the client in the browser. I also changed it in Transifex.
 2013-10-08 16:39:22 -05:00
Richard Alam
5bb5f2000d Merge branch 'master' into new-polling-feature 2013-10-07 15:16:25 +00:00
Gustavo Salazar
d673e6e484 update locales 2013-10-02 12:12:40 -07:00
Felipe Cecagno
aa597fe985 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into record-button-client 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
	record-and-playback/core/lib/recordandplayback.rb
	record-and-playback/core/lib/recordandplayback/generators/audio_processor.rb
	record-and-playback/core/lib/recordandplayback/generators/events.rb
	record-and-playback/core/lib/recordandplayback/generators/video.rb
	record-and-playback/presentation/scripts/publish/presentation.rb
 2013-09-24 15:03:44 -03:00
Richard Alam
920c56d7f1 - loclalize buttons 2013-09-24 16:31:59 +00:00
Felipe Cecagno
33d98bbff2 implemented the record button both client-side and server-side; still needs more work on the processing scripts; still needs to update the record button icons 2013-09-23 18:33:30 -03:00
Gustavo
d8e1bce801 Update locales 2013-09-23 20:46:29 +00:00
Chad Pilkey
dfc444ab6f added two strings in the log out window to locales 2013-09-04 15:01:23 -07:00
Gustavo Salazar
2007d6d7bb delete transifex dir in locales 2013-09-02 13:59:36 -05:00
jent46
8561c02d18 update locales 2013-09-02 10:44:52 -07:00
Felipe Cecagno
d8f7518bb2 Merge branch 'master' into global-audio-0.81 2013-08-25 23:35:16 -03:00
Felipe Cecagno
81e3d93bb7 Merge branch 'master' into global-audio-0.81 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/kk_KZ/bbbResources.properties
	bigbluebutton-client/locale/km_KH/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/events/ShortcutEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
 2013-08-21 15:59:33 -03:00
jent46}
6d8d8962e5 update languages (fr_FR,he_IL,id_ID,vi_VN) 2013-08-20 16:34:42 -05:00
jent46
65cdcc4789 locales updated 2013-08-14 12:45:18 -07:00
Chad Pilkey
397994cdb9 Merge pull request #219 from SenecaCDOT-BigBlueButton/better-logout 
Better logout
 2013-07-30 17:29:07 -07:00
Fred Dixon
375e75338f Fixed two spelling mistakes in US english file 2013-07-24 08:33:52 -07:00
jtrobinson
7bdeb79fec Framework for friendlier logout window in place. 2013-07-24 06:46:15 -07:00
Fred Dixon
8d9a4b93c2 Reverted back change ... not getting the formatting right on copyright line 2013-07-23 20:53:24 -07:00
Fred Dixon
e17199d62f Another tweak of copyright line 2013-07-23 20:34:06 -07:00
Fred Dixon
0bf150a330 minor updates in copyright line 2013-07-23 20:32:48 -07:00
Chad Pilkey
5461fe0dc4 changed the url in the footer to be an actual link 2013-07-22 11:19:07 -07:00
Chad Pilkey
318a7f9986 added pre and post text to the slide in the Flash client 2013-07-22 08:04:51 -07:00
Chad Pilkey
0bf957482d switched the word close in the audio and video popups with cancel 2013-07-18 09:07:19 -07:00
Chad Pilkey
d88af818f5 added 4 link buttons to the start of the tab order when a screen reader is active 2013-07-17 13:27:23 -07:00
jtrobinson
49752b56a2 Resolved conflicts 2013-07-15 09:16:50 -07:00
Hugo Lazzari
ee31721d40 Add new locale resources to pt-br and en-us 2013-07-09 09:57:25 -03:00
Hugo Lazzari
9c1c8eecfc - Added shortcut to mute button 
- Fixed joinGlobal bug
 2013-07-09 09:34:43 -03:00
Hugo Lazzari
46522fc943 Begin the global-audio with bbb 0.81 2013-07-08 10:55:53 -03: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
jtrobinson
0a8b8cc91f Changed hotkey for Repeat Current Message to the Spacebar. 2013-06-25 12:40:02 -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
Markos Calderon
2f7c2949c5 fix locale 2013-06-21 16:41:00 -05: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
3a815a4328 changed the join audio string 2013-07-12 14:29:11 -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
jtrobinson
c0c14faf4e Finished removing the term 'click' 2013-07-11 10:28:29 -07:00
jtrobinson
33e3aef400 Finished replacing 'camera' with 'webcam 2013-07-11 10:21:00 -07:00
jtrobinson
49d0766a9e Finished renaming Video Dock to Webcams 2013-07-11 10:18:40 -07:00
jtrobinson
a3d795cbac First pass-through of the en_US locale to change inaccessible language strings. 2013-07-11 09:04:25 -07:00
Markos Calderon
5ed910cde5 Updating localization files 2013-07-04 12:18:57 -05:00
jtrobinson
c61638a04f Added all locale strings for polling. 2013-06-13 11:14:46 -07:00
jtrobinson
7b3144d548 Merged upstream/master. 2013-06-10 10:34:46 -07:00
Chad Pilkey
1dd9b849b3 Merge remote branch 'upstream/master' into add-single-hand-lowering 2013-06-05 12:05:26 -07:00
Chad Pilkey
9466740722 added the ability to lower a single hand by clicking it 2013-06-05 12:05:03 -07:00
Chad Pilkey
da4a4f06ff Merge pull request #168 from SenecaCDOT-BigBlueButton/fix-handraise-not-resetting 
added a bindable property to access the client's handraise state
 2013-06-05 11:25:04 -07:00
Markos Calderon
d9d044f227 update localization files 2013-06-04 14:11:30 -05:00
Chad Pilkey
6065a1e7a7 added a bindable property to access the client's handraise state 2013-06-04 10:28:40 -07:00
Chad Pilkey
b6394ba39f cleaned up some of the localisation strings 2013-06-03 11:16:44 -07:00
Markos Calderon
ffbabcf51d remove and add strings for the localization file 2013-05-27 17:56:48 -05: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
fb56c6c886 - change how we display webcam setting popup into more like the mic settings 2013-05-25 18:04:30 +00: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
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
jtrobinson
dc12e7a0f6 Added audio alert; when Presentership is moved to or from a screen-reader user, that user is notified of their status change. 2013-05-21 12:41:22 -07:00
Markos Calderon
2e3550630f update upload presentation string 2013-06-04 10:18:57 -05:00
Hugo Lazzari
87093309f3 Fixed bug that Listen only mode didn't work if the user didn't have a microphone connected. The problem was an unchecked null reference on microphone. fixes #765 2013-05-16 13:59:02 -03:00
Chad Pilkey
27ecbcebeb mutemebutton mouse over text strings are now fixed 2013-05-14 15:56:07 -07:00
Chad Pilkey
0881bf052c removed locale strings for viewers and listeners 2013-05-14 12:10:53 -07:00
Richard Alam
36568ed037 Merge pull request #143 from SenecaCDOT-BigBlueButton/improve-client 
There are a couple of miscellaneous client improvements
 2013-05-14 10:55:57 -07:00
Chad Pilkey
628bd364cd the webcam indicator is now only a button when you have closed the stream 2013-05-13 15:58:26 -07:00
jtrobinson
e81b437740 Audio Settings window is compatible with JAWS. 2013-05-09 13:40:42 -07:00
jtrobinson
72ac0718a2 Added accessibilityDescription to audio settings help button and a corresponding string in English locale 2013-05-09 09:06:07 -07:00
jtrobinson
3bd3d6c88a Changed Ctrl-X to Ctrl-L 2013-04-26 12:13:41 -07:00
Fred Dixon
7096bb828f Updated wording for Test Microphone to Test/Change Microphone 2013-04-20 18:21:53 -07:00
Fred Dixon
5f528f004f Removed ',' from Copyright notice 2013-04-20 16:25:33 -07:00
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
Felipe Cecagno
2b73621596 changed the window title from Listeners to Speakers (since those participants are speakers now) 2013-02-01 13:17:00 -02: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