Merge branch 'master' into advanced-permissions-phase-2

.eslintrc.json

@@ -13,7 +13,8 @@
  "parser": "babel-eslint",
  "plugins": [
  "react",
- "import"
+ "import",
+ "header"
  ],
  "env": {
  "browser": true,
@@ -64,6 +65,7 @@
  "generator-star-spacing": [2, {"before": false, "after": true}],
  "global-require": 2,
  "guard-for-in": 2,
+ "header/header": [2, "line", " Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.\n See LICENSE.txt for license information."],
  "id-blacklist": 0,
  "import/no-unresolved": 2,
  "import/order": ["error", {"newlines-between": "always-and-inside-groups", "groups": ["builtin", "external", ["internal", "parent"], "sibling", "index"]}],

NOTICE.txt

@@ -1878,7 +1878,7 @@ Creative Commons may be contacted at creativecommons.org.
 
 ## whatwg-fetch
 
-This product contains a portion of `whatwg-fetch`, a promise-based mechanism for programmatically making web requests in the browser by Mislav Marohnić.
+This product contains a modified portion of 'whatwg-fetch', a promise-based mechanism for programmatically making web requests in the browser by Mislav Marohnić.
 
 * HOMEPAGE:
  * https://www.npmjs.com/package/whatwg-fetch
@@ -1945,7 +1945,7 @@ THE SOFTWARE.
 
 ## katex
 
-KaTeX is a fast, easy-to-use JavaScript library for TeX math rendering on the web.
+This product contains a modified portion of 'KaTeX', a fast, easy-to-use JavaScript library for TeX math rendering on the web.
 
 * HOMEPAGE:
  * https://github.com/Khan/KaTeX
@@ -1984,7 +1984,7 @@ SOFTWARE.
 
 ## localforage-observable
 
-This project adds observables to localForage, providing a way to get notified whenever.
+This product contains a modified portion of 'localforage-observable, which adds observables to localForage, providing a way to get notified whenever.
 
 * HOMEPAGE:
  * https://github.com/localForage/localForage-observable
@@ -2009,7 +2009,7 @@ limitations under the License.
 
 ## hoist-non-react-statics
 
-This project Copies non-react specific statics from a child component to a parent component.
+This product contains a modified portion of 'hoist-non-react-statics', which copies non-react specific statics from a child component to a parent component.
 
 * HOMEPAGE:
  * https://github.com/mridgway/hoist-non-react-statics
@@ -2029,7 +2029,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 ## react-contextmenu
 
-This project includes ContextMenu implemented in React with accessibility support, built by Vivek Kumar Bansal. 
+This product contains a modified portion of 'react-contextmenu', implemented in React with accessibility support, built by Vivek Kumar Bansal. 
 
 * HOMEPAGE:
  * https://github.com/vkbansal/react-contextmenu
@@ -2050,7 +2050,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ## url-search-params-polyfill
 
-This project is a polyfill library for javascript's URLSearchParams class. This library has implemented all features from MDN document, built by Jerry Bendy. 
+This product contains a modified portion of 'url-search-params-polyfill', a polyfill library for javascript's URLSearchParams class. This library has implemented all features from MDN document, built by Jerry Bendy. 
 
 * HOMEPAGE:
  * https://github.com/jerrybendy/url-search-params-polyfill
@@ -2078,3 +2078,35 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+--------
+
+## moment-timezone
+
+This product contains a modified portion of 'moment-timezone', which adds timezone support for moment.js, built by Moment.js. 
+
+* HOMEPAGE:
+ * https://github.com/moment/moment-timezone
+
+* LICENSE:
+
+The MIT License (MIT)
+
+Copyright (c) JS Foundation and other contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

actions/admin_actions.jsx

@@ -1,5 +1,5 @@
-// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
 
 import * as AdminActions from 'mattermost-redux/actions/admin';
 import * as UserActions from 'mattermost-redux/actions/users';
@@ -23,9 +23,10 @@ export async function saveConfig(config, success, error) {
 }
 
 export async function reloadConfig(success, error) {
- const {data, error: err} = await AdminActions.reloadConfig()(dispatch, getState);
+ const {data, error: err} = await dispatch(AdminActions.reloadConfig());
  if (data && success) {
- AdminActions.getConfig()(dispatch, getState);
+ dispatch(AdminActions.getConfig());
+ dispatch(AdminActions.getEnvironmentConfig());
  success(data);
  } else if (err && error) {
  error({id: err.server_error_id, ...err});
@@ -271,6 +272,15 @@ export async function elasticsearchTest(config, success, error) {
  }
 }
 
+export async function testS3Connection(success, error) {
+ const {data, error: err} = await AdminActions.testS3Connection()(dispatch, getState);
+ if (data && success) {
+ success(data);
+ } else if (err && error) {
+ error({id: err.server_error_id, ...err});
+ }
+}
+
 export async function elasticsearchPurgeIndexes(success, error) {
  const {data, error: err} = await AdminActions.purgeElasticsearchIndexes()(dispatch, getState);
  if (data && success) {

actions/channel_actions.jsx

@@ -1,5 +1,5 @@
-// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
 
 import * as ChannelActions from 'mattermost-redux/actions/channels';
 import {deletePreferences, savePreferences} from 'mattermost-redux/actions/preferences';

actions/diagnostics_actions.jsx

@@ -1,5 +1,5 @@
-// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
 
 import {getConfig} from 'mattermost-redux/selectors/entities/general';
 

actions/emoji_actions.jsx

@@ -1,5 +1,5 @@
-// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
 
 import * as EmojiActions from 'mattermost-redux/actions/emojis';
 

actions/file_actions.jsx

@@ -1,5 +1,5 @@
-// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
 
 import {batchActions} from 'redux-batched-actions';
 import request from 'superagent';

actions/global_actions.jsx

@@ -1,5 +1,5 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// See LICENSE.txt for license information.
 
 import debounce from 'lodash/debounce';
 

actions/integration_actions.jsx

@@ -1,5 +1,5 @@
-// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
 
 import request from 'superagent';
 import * as IntegrationActions from 'mattermost-redux/actions/integrations';

actions/job_actions.jsx

@@ -1,5 +1,5 @@
-// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
 
 import * as JobsActions from 'mattermost-redux/actions/jobs';
 

actions/notification_actions.jsx

@@ -1,5 +1,5 @@
-// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
 
 import {getConfig} from 'mattermost-redux/selectors/entities/general';
 import {isChannelMuted} from 'mattermost-redux/utils/channel_utils';
@@ -33,7 +33,7 @@ export function sendDesktopNotification(post, msgProps) {
  const userStatus = UserStore.getStatus(user.id);
  const member = ChannelStore.getMyMember(post.channel_id);
 
- if (isChannelMuted(member) || userStatus === UserStatuses.DND) {
+ if (isChannelMuted(member) || userStatus === UserStatuses.DND || userStatus === UserStatuses.OUT_OF_OFFICE) {
  return;
  }
 

actions/oauth_actions.jsx

@@ -1,5 +1,5 @@
-// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
 
 import * as IntegrationActions from 'mattermost-redux/actions/integrations';
 

actions/post_actions.jsx

@@ -1,5 +1,5 @@
-// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
 
 import {batchActions} from 'redux-batched-actions';
 import {PostTypes, SearchTypes} from 'mattermost-redux/action_types';

actions/status_actions.jsx

@@ -1,5 +1,5 @@
-// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
 
 import {getStatusesByIds} from 'mattermost-redux/actions/users';
 

actions/storage.js

@@ -1,5 +1,5 @@
-// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
 
 import {StorageTypes} from 'utils/constants';
 import {getPrefix} from 'utils/storage_utils';

actions/team_actions.jsx

@@ -1,5 +1,5 @@
-// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
 
 import {TeamTypes} from 'mattermost-redux/action_types';
 import {viewChannel, getChannelStats} from 'mattermost-redux/actions/channels';

actions/user_actions.jsx

@@ -1,5 +1,5 @@
-// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
 
 import {getChannelAndMyMember} from 'mattermost-redux/actions/channels';
 import {getClientConfig, getLicenseConfig} from 'mattermost-redux/actions/general';
@@ -22,7 +22,7 @@ import store from 'stores/redux_store.jsx';
 import TeamStore from 'stores/team_store.jsx';
 import UserStore from 'stores/user_store.jsx';
 import * as Utils from 'utils/utils.jsx';
-import {Constants, Preferences} from 'utils/constants.jsx';
+import {Constants, Preferences, UserStatuses} from 'utils/constants.jsx';
 
 const dispatch = store.dispatch;
 const getState = store.getState;
@@ -673,7 +673,11 @@ export function autoResetStatus() {
  return userStatus;
  }
 
- const autoReset = getBool(getState(), PreferencesRedux.CATEGORY_AUTO_RESET_MANUAL_STATUS, currentUserId, false);
+ let autoReset = getBool(getState(), PreferencesRedux.CATEGORY_AUTO_RESET_MANUAL_STATUS, currentUserId, false);
+ const userIsOutOfOffice = Selectors.getStatusForUserId(getState(), currentUserId) === UserStatuses.OUT_OF_OFFICE;
+ if (userIsOutOfOffice) {
+ autoReset = false;
+ }
 
  if (autoReset) {
  UserActions.setStatus({user_id: currentUserId, status: 'online'})(doDispatch, doGetState);

actions/views/channel.js

@@ -1,5 +1,5 @@
-// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
 
 import {isMobile} from 'utils/utils.jsx';
 import {ActionTypes} from 'utils/constants.jsx';

actions/views/create_comment.jsx

@@ -1,5 +1,5 @@
-// Copyright (c) 2017 Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
 
 import {createSelector} from 'reselect';
 import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users';

actions/views/edit_post_modal.js

@@ -1,5 +1,5 @@
-// Copyright (c) 2017 Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
 
 import * as PostActions from 'mattermost-redux/actions/posts';
 

actions/views/lhs.js

@@ -1,5 +1,5 @@
-// Copyright (c) 2018-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
 
 import {ActionTypes} from 'utils/constants.jsx';
 

actions/views/modals.js

@@ -1,5 +1,5 @@
-// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
 
 import {ActionTypes} from 'utils/constants';
 

actions/views/notice.js

@@ -1,5 +1,5 @@
-// Copyright (c) 2018-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
 
 import {ActionTypes} from 'utils/constants';
 

actions/views/rhs.js

@@ -1,5 +1,5 @@
-// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
 
 import {batchActions} from 'redux-batched-actions';
 

actions/views/search.js

@@ -1,5 +1,5 @@
-// Copyright (c) 2018-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
 
 import {SearchTypes} from 'utils/constants';
 

actions/views/webrtc.js

@@ -1,5 +1,5 @@
-// Copyright (c) 2018-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
 
 import {ActionTypes} from 'utils/constants.jsx';
 

actions/webrtc_actions.jsx

@@ -1,5 +1,5 @@
-// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
 
 import {Client4} from 'mattermost-redux/client';
 

actions/websocket_actions.jsx

@@ -1,5 +1,5 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// See LICENSE.txt for license information.
 
 import $ from 'jquery';
 import {batchActions} from 'redux-batched-actions';
@@ -462,6 +462,11 @@ function handleDirectAddedEvent(msg) {
 function handleUserAddedEvent(msg) {
  if (ChannelStore.getCurrentId() === msg.broadcast.channel_id) {
  getChannelStats(ChannelStore.getCurrentId())(dispatch, getState);
+ dispatch({
+ type: UserTypes.RECEIVED_PROFILE_IN_CHANNEL,
+ data: {user_id: msg.data.user_id},
+ id: msg.broadcast.channel_id,
+ });
  }
 
  if (TeamStore.getCurrentId() === msg.data.team_id && UserStore.getCurrentId() === msg.data.user_id) {

client/web_websocket_client.jsx

@@ -1,5 +1,5 @@
-// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
 
 import WebSocketClient from './websocket_client.jsx';