Felipe Cecagno
|
417b518c2b
|
Merge branch 'v0.81-release' of https://github.com/bigbluebutton/bigbluebutton into guest-role-0.81
Conflicts:
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
|
2014-02-24 12:37:35 -03:00 |
|
Richard Alam
|
a6a58e6ecb
|
- update java string to u51
|
2014-01-16 17:57:31 -05:00 |
|
Chad Pilkey
|
336c8f72f3
|
created a new locale string for the chat module
|
2013-10-31 16:27:14 -07: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 |
|
Felipe Cecagno
|
9bfb5d236a
|
better handling the settings window; now the window is only created when the user clicks on the button, so it won't be shown anymore for non-moderator participants
|
2013-09-15 19:07:36 -03:00 |
|
Chad Pilkey
|
dfc444ab6f
|
added two strings in the log out window to locales
|
2013-09-04 15:01:23 -07:00 |
|
Felipe Cecagno
|
65163c49ef
|
Merge branch 'master' into guest-role-0.81
Conflicts:
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/events/LogoutEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
|
2013-08-26 15:13:38 -03: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 |
|
Hugo Lazzari
|
a91a2df678
|
Merge branch 'master' into guest-role-0.81
Conflicts:
bbb-api-demo/src/main/webapp/demo3.jsp
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonSession.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/User.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/java/org/bigbluebutton/conference/service/recorder/participants/ParticipantsEventRecorder.java
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/common/Images.as
bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
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/main/model/users/events/UsersConnectionEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
bigbluebutton-web/application.properties
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
|
2013-07-24 11:25:36 -03: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 |
|
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 |
|
Felipe Cecagno
|
2c24931bac
|
some refactor on the guest code to make it clearer and also to make the views prettier
|
2013-06-18 17:02:50 -03: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 |
|
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 |
|
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 |
|