tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into gs-master

Browse Source
This commit is contained in:
David Yip
2017-10-16 09:23:59 -05:00
parent 6cd5b3bbe5 aec70b44fc
commit dbb1fce94d
67 changed files with 1520 additions and 787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/javascript/mastodon/features/compose/containers/autosuggest_status_container.js
View File

@@ -1,15 +0,0 @@
import { connect } from 'react-redux';
import AutosuggestStatus from '../components/autosuggest_status';
import { makeGetStatus } from '../../../selectors';
const makeMapStateToProps = () => {
const getStatus = makeGetStatus();
const mapStateToProps = (state, { id }) => ({
status: getStatus(state, id),
});
return mapStateToProps;
};
export default connect(makeMapStateToProps)(AutosuggestStatus);

2
app/javascript/mastodon/features/compose/containers/sensitive_button_container.js
View File

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
import classNames from 'classnames';
import IconButton from '../../../components/icon_button';
import { changeComposeSensitivity } from '../../../actions/compose';
import Motion from 'react-motion/lib/Motion';
import Motion from '../../ui/util/optional_motion';
import spring from 'react-motion/lib/spring';
import { injectIntl, defineMessages } from 'react-intl';