Commit Graph

14352 Commits

Author SHA1 Message Date
Fred Dixon
c28c78a405 Minor updates for release -- bumped the API version 2017-03-06 13:57:54 -06:00
Richard Alam
3ec0167812 - synchronize create meeting to prevent race condition where 2 meetings
with different voice bridge gets created.
2017-03-06 19:20:23 +00:00
Anton Georgiev
71b995ecdf Merge pull request #3699 from OZhurbenko/meteor-update
HTML5 - Meteor 1.4.3.1
2017-03-06 14:18:18 -05:00
Anton Georgiev
8536329a59 Merge pull request #3704 from JaeeunCho/slide-arrow-button
HTML5 - changed the location of slide's arrow buttons
2017-03-06 13:57:32 -05: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
JaeeunCho
e2964d2c8f HTML5 - changed the location of slide's arrow buttons 2017-03-03 09:55:11 -08: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
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
Oleksandr Zhurbenko
bba1d52716 Adjusted history package version to work with the latest react-router 2017-03-02 11:06:51 -08:00
Oleksandr Zhurbenko
6bafa381d6 Updated npm packages to the latest 2017-03-02 10:59:44 -08:00
Oleksandr Zhurbenko
7b3bc48be4 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into icons-update 2017-03-02 10:11:59 -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
80666bd688 Updated icons in the html5 client 2017-03-01 17:03:02 -08:00
Oleksandr Zhurbenko
0677116ef2 Meteor 1.4.3.1 2017-03-01 15:02:58 -08:00
Oleksandr Zhurbenko
7e54305850 Fixed warnings in the polling component 2017-03-01 14:55:44 -08:00
gcampes
8d2a51a00a Remove console log 2017-03-01 17:29:18 -03: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
gcampes
91da3e0262 Fix font size not showing in settings modal 2017-03-01 14:37:55 -03: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
gcampes
a6947bdd17 removes debug code 2017-03-01 09:32:23 -03:00
gcampes
4918cf9160 fix bug with focus 2017-03-01 09:22:11 -03:00
Ghazi Triki
75a3155f03 Updated deskshare button tooltip. 2017-03-01 08:38:34 +01:00