JaeeunCho
3fb3d614fa
HTML5 - changed comment and moved into block
2017-03-06 09:25:35 -08:00
JaeeunCho
317ad3ada2
Merge remote-tracking branch 'upstream/master' into close
2017-03-06 09:23:37 -08:00
Richard Alam
b50dab633b
Merge pull request #3708 from ritzalam/change-line-endings
...
- change line endings of file by running dos2unix
2017-03-06 10:48:47 -05:00
Richard Alam
d83fc6466a
- change line endings of file by running dos2unix
2017-03-06 15:43:41 +00:00
Fred Dixon
b8c2548ed9
Merge pull request #3707 from ffdixon/update-cron
...
Remove *.meta files from saved red5 streams
2017-03-04 21:31:59 -05:00
Fred Dixon
18e1f3539a
Updated cron.daily to remove *.meta files from /usr/share/red5/webapps/video/streams
2017-03-04 20:30:11 -06:00
Fred Dixon
c0c58b5507
Update BigBlueButton.html
...
Modified "You need Flash Installed" message.
2017-03-04 10:02:39 -05:00
Fred Dixon
55c3e901d3
Merge pull request #3706 from capilkey/screenshare-tunnel-warning
...
Add a warning to screenshare publish when tunneling
2017-03-03 20:04:50 -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
JaeeunCho
3355ad5d82
HTML5 - did lint code and chaged it
2017-03-02 13:42:39 -08:00
Fred Dixon
ad8e86f1cf
Merge pull request #3702 from ffdixon/fix-bbb-conf-lti
...
Fixed reference to lti.properties
2017-03-02 16:19:08 -05:00
Fred Dixon
2f528b5d74
Fixed reference to lti.properties
2017-03-02 15:17:40 -06:00
JaeeunCho
a67ef17930
HTML5 - changed code for session
2017-03-02 12:33:49 -08:00
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
