Richard Alam
5cf7a60cf7
- do not show eject button when allowKickUser is false
2013-07-29 12:43:07 -07:00
Richard Alam
05490b130b
- do not show unlocked layout icon to viewers
2013-07-29 11:35:09 -07:00
Richard Alam
e80e368a1e
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2013-07-27 12:32:14 -07:00
Fred Dixon
a306eac7cf
Modified test Java link in default.pdf
2013-07-27 19:34:25 -07:00
Fred Dixon
c60d739584
Updated defaut.pdf to have a link to test running a Java applet (for testing desktop sharing)
2013-07-27 19:16:15 -07:00
Richard Alam
d8cae838d7
- fix https://code.google.com/p/bigbluebutton/issues/detail?id=1587 where
...
webcam cannot be started again when window is closed while previewing video
2013-07-27 12:17:23 -07:00
Richard Alam
7752f49e03
- move commons-io jar into red5/lib as we get a class not found error when
...
desktop sharing is tunneling
2013-07-27 02:07:43 -07:00
Fred Dixon
63309b30ab
Merge pull request #218 from tylercopeland/updated-upload-icon
...
Updated upload document icon
2013-07-26 12:51:34 -07:00
Tyler Copeland
b6de969cbf
Updated upload document icon
2013-07-26 15:05:42 -04:00
jtrobinson
dfb7a9e0d6
Trying to replace the ConfirmLogoutWindow with mx:Alert. There is supposedly a way to make it accessible.
2013-07-26 11:05:09 -07:00
Hugo Lazzari
d556be888d
Fixed bug on guest window, fixed method error.
2013-07-26 09:57:12 -03:00
jtrobinson
9d14bbb16c
Tried to resolve edge case of a user focusing out of the window while Confirm Logout dialog is open, trying to tab back in without mouse. Still unresolved.
2013-07-25 11:08:11 -07:00
Hugo Lazzari
1d99f3ed30
Bugfix: Missed method included, still need to fix bug on client that crash.
2013-07-25 11:48:20 -03:00
jtrobinson
df456dfd4a
Clicking NO in the confirm dialog returns focus to the Logout button on the MainToolbar, in keeping with existing focus patterns.
2013-07-25 07:16:40 -07:00
jtrobinson
e7e22013ff
Base confirm-logout functionality in place. Need to integrate into tab order and focus.
2013-07-25 06:52:54 -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
Fred Dixon
15ee5fc404
updated label to 0.81-beta-2
2013-07-23 20:30:21 -07:00
Gustavo Salazar
7ad90a83b2
Merge pull request #216 from SenecaCDOT-BigBlueButton/second-round-accessibility-fixes
...
Second round accessibility fixes
2013-07-23 13:32:04 -07:00
Fred Dixon
7ab1dc4cb3
Merge pull request #217 from kepstin/ffmpeg-version-check
...
FFmpeg version check changes
2013-07-23 13:15:11 -07:00
Calvin Walton
ab8882e50c
Add an ffmpeg version check to bbb-conf --check
2013-07-23 15:47:54 -04:00
Calvin Walton
a5091ba3e8
RaP: Remove the ffmpeg version check, hardcode arguments for 0.11+
...
For BigBlueButton 0.81, we just require that you install ffmpeg 0.11.x
for recordings to function correctly. I'll also add a check to bbb-conf
to verify that the correct ffmpeg is available.
2013-07-23 15:46:47 -04:00
Markos Calderon
da8ab0e4d5
Merge pull request #215 from bigbluebutton/deskshare-fullscreen-config
...
Added autoFullScreen in config xml
2013-07-22 18:00:47 -07:00
Markos Calderon
65bc8774f3
Added autoFullScreen in config xml
2013-07-22 19:58:35 -05:00
Chad Pilkey
486bf82522
added checkbox to conditionally expose chat messages to a screen reader
2013-07-22 15:09:10 -07:00
Chad Pilkey
98b76f9bb0
added content headers to playback.html
2013-07-22 15:08:16 -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
ccce791315
removed the deskshare region button from the tab order
2013-07-22 08:05:15 -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
520fd7eadf
when options is clicked focus the user list
2013-07-19 11:00:52 -07:00
Fred Dixon
c79d7b951d
Merge pull request #212 from SenecaCDOT-BigBlueButton/remove-video-chat-link
...
removed the private chat button from the webcam control buttons when the...
2013-07-19 09:23:43 -07:00
Fred Dixon
ecb6cbc718
Merge pull request #214 from tylercopeland/fix-demo-width
...
Fix demo width
2013-07-19 09:22:55 -07:00
Tyler Copeland
57b85b9c58
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2013-07-19 11:48:19 -04:00
Tyler Copeland
c40ae796d8
Updates to demo landing page
2013-07-19 11:47:32 -04:00
Jesus Federico
53dcbc82f8
bbb-lti: Restored xml extension to endPoint
2013-07-19 11:44:45 -04:00
Jesus Federico
553875287a
bbb-lti: Restored bbb-lti.log file
2013-07-19 09:51:16 -04:00
Hugo Lazzari
e7cb88cf29
Refactoring guest
2013-07-19 10:05:24 -03:00
bbb-test
c565c45b51
Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton
2013-07-18 13:49:24 -07:00
Jesus Federico
dffdfa11ea
bbb-lti: Simplified the url generation for the LTI xml cartridge
2013-07-18 16:48:48 -04:00
Gustavo Salazar
422e7570a0
Merge pull request #213 from kepstin/opaque-recording-slides
...
RaP: Adjust the 'convert' command to make opaque images
2013-07-18 13:21:15 -07:00
Jesus Federico
e51f30123a
bbb-lti: Changed endpoint configuration to make it independent of the protocol
2013-07-18 15:27:21 -04:00
Jesus Federico
5e474dd3a9
bbb-lti: Added lti cartridge as response for GET request to tool.xml
2013-07-18 15:16:21 -04:00
Chad Pilkey
0bf957482d
switched the word close in the audio and video popups with cancel
2013-07-18 09:07:19 -07:00
Calvin Walton
ecfe8b7db4
RaP: Adjust the 'convert' command to make opaque images
...
This forces a background colour of white on the generated png images for
slides in the slides and presentation recording formats. Fixes Issue
1588.
2013-07-17 18:08:51 -04:00
Chad Pilkey
c657ab88c3
removed the private chat button from the webcam control buttons when the chat module is absent from the config.xml
2013-07-17 14:54:40 -07:00
Chad Pilkey
63f51c2c25
Merge pull request #211 from SenecaCDOT-BigBlueButton/add-window-links
...
Add window links
2013-07-17 13:36:11 -07:00