JaeeunCho
a485873bf2
Merge remote-tracking branch 'upstream/master' into close
2017-03-02 12:32:29 -08:00
Anton Georgiev
e67b2a733e
Merge pull request #3686 from oswaldoacauan/fix-reply-messages-remove
...
[HTML5] Fix presentations/shapes reply messages
2017-03-02 11:44:26 -05:00
Anton Georgiev
c92baed843
Merge pull request #3685 from OZhurbenko/whiteboard-restructuring
...
HTML5 Whiteboard Restructuring
2017-03-02 11:37:18 -05:00
Anton Georgiev
d83c391997
Merge pull request #3684 from oswaldoacauan/refactor-api-users
...
[HTML5] Refactor API Users
2017-03-02 11:32:02 -05:00
Oswaldo Acauan
5ef65300b6
Fix user not being able to revalidate
2017-03-02 16:23:53 +00:00
Oswaldo Acauan
5b407d40f4
Remove debug line
2017-03-02 16:08:49 +00:00
Oswaldo Acauan
715b11fe46
Fix emojiStatus undefined logger variable
2017-03-02 16:07:45 +00:00
Richard Alam
608caecb70
Merge pull request #3701 from riadvice/fix-webcams
...
Display camera list
2017-03-02 09:17:03 -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
Oleksandr Zhurbenko
7e54305850
Fixed warnings in the polling component
2017-03-01 14:55:44 -08:00
JaeeunCho
fa7d46af73
HTML5 - added session array for close private chat
2017-03-01 13:27:05 -08:00
JaeeunCho
9b5358f9ac
Merge remote-tracking branch 'upstream/master' into close
2017-03-01 13:21:55 -08:00
Richard Alam
c7c80b927a
Merge pull request #3652 from riadvice/accessibility-improve
...
Accessibility improve and fix for release 1.1
2017-03-01 14:54:27 -05: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
Fred Dixon
5eea825e7f
Merge pull request #3695 from kepstin/presentation-question-mark
...
Correctly use jquery to modify links in chat messages.
2017-03-01 14:39:57 -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
Calvin Walton
e782709913
Correctly use jquery to modify links in chat messages.
...
The code was previously passing the message string provided by the user
directly to jQuery - which works okish if the first character is '<' since
it'll parse it as HTML, but the chat messages don't. As a result, it was
sometimes being parsed as a selector, failing, and raising an exception.
The fix is to put the chat message into a DOM node (have the browser parse
the HTML) before doing the jQuery operation to modify the link targets.
Fixes #3670
2017-03-01 10:38:39 -05: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
Richard Alam
b7d0993edc
Merge pull request #3674 from riadvice/flex-scrollbars
...
Updated FileUploadWindow.mxml to never show scroll bars
2017-03-01 10:25:52 -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
JaeeunCho
775dd27309
HTML5 - added array for close private chat
2017-02-28 14:55:00 -08:00
JaeeunCho
07f45f695a
HTML5 - close private chat
2017-02-28 14:40:16 -08:00
Anton Georgiev
38c3c73b63
simplify; fix issue with incorrect removing procedure
2017-02-28 17:24:21 -05:00
Richard Alam
89351c50d6
Merge pull request #3683 from riadvice/increase-pdf2swf-timeout
...
Increased PDF2SWF timeout for some PDF files containing a lot of elements
2017-02-28 14:03:11 -05:00
Richard Alam
cd5017b67c
Merge pull request #3692 from ritzalam/update-screenshare-doc
...
- keep copy of original javacv doc in another file.
2017-02-28 12:20:25 -05:00
Richard Alam
10727855c5
- forgot to commit
2017-02-28 17:18:14 +00:00
Richard Alam
99362a1086
- keep copy of original javacv doc in another file.
2017-02-28 17:15:45 +00:00
Richard Alam
c908d5d38b
Merge pull request #3691 from ritzalam/update-screenshare-doc
...
Update screenshare doc
2017-02-28 11:57:16 -05:00
Richard Alam
1c4b0d96d2
- fix formatting and typos
2017-02-28 16:54:16 +00:00
Richard Alam
657236fe5f
Write document on how to build screenshare app.
2017-02-28 16:50:07 +00: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
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
Oswaldo Acauan
19f119fcf6
Fix presentations not being removed while non existent in the reply message
2017-02-24 13:57:10 +00:00
Oswaldo Acauan
cc0999013f
Fix shapes not being removed while non existent in the reply message
2017-02-24 13:10:55 +00:00
Oswaldo Acauan
f3f4f8ddfe
Fix bugs on the voiceUpdate handlers
2017-02-23 20:35:36 +00:00
Oswaldo Acauan
5e9a7d8e39
Fix bug when removing users
2017-02-23 20:26:34 +00:00
Oleksandr Zhurbenko
fe01f81e27
changed slide-controls to presentation-toolbar
...
.. and removed duplicate strings from the locales
2017-02-23 12:20:21 -08:00
Oswaldo Acauan
b6e80815bd
Fix a bunch of bugs introduced after the refactor
2017-02-23 20:16:10 +00:00
