Ubuntu
529bec5eac
Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2
2017-03-21 15:21:44 +00:00
perroned
ffea5cf785
Cleans up
2017-03-20 19:02:59 +00:00
Ubuntu
4da7d6d03f
Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2
2017-03-17 15:55:23 +00:00
perroned
dd6f869059
Fixes exceptions and jnlp download issue
2017-03-13 21:20:13 +00:00
Chad Pilkey
0235dd5adb
fix plus and minus shortcut modifier in key table
2017-03-08 19:26:02 -05:00
Chad Pilkey
65b89074e6
more accessibity fixes for 1.1
2017-03-08 16:15:40 -05:00
Fred Dixon
55525672f2
Update bbbResources.properties
2017-03-06 15:30:00 -05:00
Fred Dixon
c28c78a405
Minor updates for release -- bumped the API version
2017-03-06 13:57:54 -06:00
perroned
dab5adb5be
Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2
...
Conflicts:
bigbluebutton-html5/imports/ui/components/media/container.jsx
bigbluebutton-html5/server/main.js
2017-03-06 19:21:40 +00:00
Fred Dixon
c0c58b5507
Update BigBlueButton.html
...
Modified "You need Flash Installed" message.
2017-03-04 10:02:39 -05:00
Chad Pilkey
9721d03274
add a warning to screenshare publish when tunneling
2017-03-03 19:17:03 -05:00
Chad Pilkey
ae2b891d8f
Merge pull request #3638 from riadvice/client-language-auto-detect-improve
...
Improve ResourceUtil.as class
2017-03-03 12:18:08 -05:00
Ghazi Triki
35dab193e1
Update camera list after the popup is displayed and not after the creation complete.
2017-03-02 10:56:15 +01:00
Ghazi Triki
3b2b8a692e
Merge branch 'master' into accessibility-improve
...
# Conflicts:
# bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
2017-03-01 20:53:48 +01:00
Richard Alam
8904d3ace8
Merge pull request #3697 from antobinary/reconnect-webcams
...
Handle multiple webcams per user so they survive reconnection. Fixes #3585
2017-03-01 14:51:34 -05:00
Richard Alam
b0c992cca4
Merge pull request #3680 from riadvice/popup-imporve
...
Improve PopUp windows open behaviour
2017-03-01 14:49:36 -05:00
Fred Dixon
0aec7e3422
Merge pull request #3696 from capilkey/1.1-accessiblity-fixes
...
Change chat message selection indicator
2017-03-01 14:40:22 -05:00
Anton Georgiev
ad59c80853
adjust ExternalApiCalls for multiple recovered cams
2017-03-01 13:56:10 -05:00
Chad Pilkey
443e131bde
chat selection indicator is now a bg highlight instead of box
2017-03-01 12:06:13 -05:00
Ghazi Triki
290f1620e1
Merge branch 'master' into accessibility-improve
...
# Conflicts:
# bigbluebutton-client/locale/en_US/bbbResources.properties
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
2017-03-01 16:56:35 +01:00
Anton Georgiev
4c4ad35ba5
cleanup
2017-03-01 10:54:01 -05:00
Ghazi Triki
ce79fa5b8e
Merge branch 'master' into popup-imporve
...
# Conflicts:
# bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
2017-03-01 16:48:04 +01:00
Richard Alam
f73787448e
Merge pull request #3693 from capilkey/1.1-accessiblity-fixes
...
1.1 accessiblity fixes
2017-03-01 10:31:39 -05:00
Richard Alam
250b29e8ac
Merge pull request #3689 from ritzalam/webcam-recording
...
Do not record webcam if meeting is not recorded
2017-03-01 10:30:40 -05:00
Richard Alam
96a5b84f5d
Merge pull request #3676 from riadvice/fix-shortcut-keys-hide
...
Make sure that "showButton" property of config shortcutKeys is read by MainToolbar
2017-03-01 10:27:03 -05:00
Ghazi Triki
75a3155f03
Updated deskshare button tooltip.
2017-03-01 08:38:34 +01:00
Chad Pilkey
5b72d93669
removed old chat message list custom accessibility functionality
2017-02-28 17:55:56 -05:00
Anton Georgiev
38c3c73b63
simplify; fix issue with incorrect removing procedure
2017-02-28 17:24:21 -05:00
Anton Georgiev
82ea9c6116
remove camera when unpublishing
2017-02-28 11:12:47 -05:00
Anton Georgiev
e30f019026
control the elements of _myCamSettings
2017-02-27 17:25:17 -05:00
perroned
d269ac7377
Fixes resize if video is not ready
2017-02-27 20:09:50 +00:00
perroned
59435c6020
Cleaning
2017-02-27 19:59:54 +00:00
Richard Alam
ca539f9098
Do not record webcam if meeting is not recorded
...
Currently, we record webcams even if the meeting is not being recorded. We add
an indicator in the webcam stream name ("-recorded") to trigger bbb-video in
red5 to record the webcam stream.
2017-02-27 19:54:21 +00:00
Anton Georgiev
ed8b4376e7
store both cameras so we can resume sharing upon reconnect
2017-02-24 16:55:25 -05:00
perroned
92c3cdb746
Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2
2017-02-23 19:20:37 +00:00
Ghazi Triki
2469a2f07e
Change focus to breakout rooms list hotkey to CTRL+R instead of CTRL+T
2017-02-23 16:50:27 +01:00
Ghazi Triki
b263058e68
Re-activate kick user hotkey.
2017-02-23 13:44:48 +01:00
Chad Pilkey
d053398103
made chat items selectable for screen readers
2017-02-22 15:31:41 -05:00
perroned
2d04f057cc
Cleans up html5 screenshare
2017-02-22 20:31:09 +00:00
Ghazi Triki
48ba379fbf
Open logout window only once.
2017-02-22 16:12:58 +01:00
Ghazi Triki
d4cec30d61
Replace the use of PopUpManager by PopUpUtil for add and removing pop-up components.
2017-02-22 11:22:05 +01:00
Ghazi Triki
605b47c1af
Update removePopUp method of PopUpUtil to accept a class or an instance.
2017-02-22 11:21:11 +01:00
perroned
de1a91950e
Restructure constraints
2017-02-21 21:07:42 +00:00
Ghazi Triki
ad045e95e8
Added PopUpUtil class to make managing concurrent PopUps easier.
2017-02-21 15:24:23 +01:00
Ghazi Triki
edc761dbe1
Make sure that "showButton" property of config shortcutKeys tag is handled and removing unused code that references it.
2017-02-20 22:14:51 +01:00
Ghazi Triki
8f136bbf8d
Updated FileUploadWindow.mxml to never show scroll bars.
2017-02-20 16:23:49 +01:00
Ghazi Triki
fc4420f04f
Set focus on ScreensharePublishWindow when we opened.
2017-02-15 15:12:29 +01:00
Ghazi Triki
2e7c673636
Changing layout can now be done using space or enter keys while using the keyboard.
2017-02-15 11:25:34 +01:00
Ghazi Triki
a8c44fba91
Added global hotkey to open breakout rooms window.
2017-02-14 10:34:01 +01:00
Ghazi Triki
3710ba9a4a
Fixed focus to wbecams window hotkey.
2017-02-13 15:13:02 +01:00
