313 changed files with 665 additions and 681 deletions
@ -1,3 +0,0 @@ |
|||
[submodule "app/javascript/themes/mastodon-go"] |
|||
path = app/javascript/themes/mastodon-go |
|||
url = https://github.com/marrus-sh/mastodon-go |
@ -1,4 +1,4 @@ |
|||
import api, { getLinks } from 'themes/glitch/util/api'; |
|||
import api, { getLinks } from 'flavours/glitch/util/api'; |
|||
|
|||
export const ACCOUNT_FETCH_REQUEST = 'ACCOUNT_FETCH_REQUEST'; |
|||
export const ACCOUNT_FETCH_SUCCESS = 'ACCOUNT_FETCH_SUCCESS'; |
@ -1,4 +1,4 @@ |
|||
import api, { getLinks } from 'themes/glitch/util/api'; |
|||
import api, { getLinks } from 'flavours/glitch/util/api'; |
|||
import { fetchRelationships } from './accounts'; |
|||
|
|||
export const BLOCKS_FETCH_REQUEST = 'BLOCKS_FETCH_REQUEST'; |
@ -1,4 +1,4 @@ |
|||
import api from 'themes/glitch/util/api'; |
|||
import api from 'flavours/glitch/util/api'; |
|||
|
|||
export const STATUS_CARD_FETCH_REQUEST = 'STATUS_CARD_FETCH_REQUEST'; |
|||
export const STATUS_CARD_FETCH_SUCCESS = 'STATUS_CARD_FETCH_SUCCESS'; |
@ -1,6 +1,6 @@ |
|||
import api from 'themes/glitch/util/api'; |
|||
import api from 'flavours/glitch/util/api'; |
|||
import { throttle } from 'lodash'; |
|||
import { search as emojiSearch } from 'themes/glitch/util/emoji/emoji_mart_search_light'; |
|||
import { search as emojiSearch } from 'flavours/glitch/util/emoji/emoji_mart_search_light'; |
|||
import { useEmoji } from './emojis'; |
|||
|
|||
import { |
@ -1,4 +1,4 @@ |
|||
import api, { getLinks } from 'themes/glitch/util/api'; |
|||
import api, { getLinks } from 'flavours/glitch/util/api'; |
|||
|
|||
export const DOMAIN_BLOCK_REQUEST = 'DOMAIN_BLOCK_REQUEST'; |
|||
export const DOMAIN_BLOCK_SUCCESS = 'DOMAIN_BLOCK_SUCCESS'; |
@ -1,4 +1,4 @@ |
|||
import api, { getLinks } from 'themes/glitch/util/api'; |
|||
import api, { getLinks } from 'flavours/glitch/util/api'; |
|||
|
|||
export const FAVOURITED_STATUSES_FETCH_REQUEST = 'FAVOURITED_STATUSES_FETCH_REQUEST'; |
|||
export const FAVOURITED_STATUSES_FETCH_SUCCESS = 'FAVOURITED_STATUSES_FETCH_SUCCESS'; |
@ -1,4 +1,4 @@ |
|||
import api from 'themes/glitch/util/api'; |
|||
import api from 'flavours/glitch/util/api'; |
|||
|
|||
export const REBLOG_REQUEST = 'REBLOG_REQUEST'; |
|||
export const REBLOG_SUCCESS = 'REBLOG_SUCCESS'; |
@ -1,6 +1,6 @@ |
|||
import api, { getLinks } from 'themes/glitch/util/api'; |
|||
import api, { getLinks } from 'flavours/glitch/util/api'; |
|||
import { fetchRelationships } from './accounts'; |
|||
import { openModal } from 'themes/glitch/actions/modal'; |
|||
import { openModal } from 'flavours/glitch/actions/modal'; |
|||
|
|||
export const MUTES_FETCH_REQUEST = 'MUTES_FETCH_REQUEST'; |
|||
export const MUTES_FETCH_SUCCESS = 'MUTES_FETCH_SUCCESS'; |
@ -1,4 +1,4 @@ |
|||
import api, { getLinks } from 'themes/glitch/util/api'; |
|||
import api, { getLinks } from 'flavours/glitch/util/api'; |
|||
import { List as ImmutableList } from 'immutable'; |
|||
import IntlMessageFormat from 'intl-messageformat'; |
|||
import { fetchRelationships } from './accounts'; |
@ -1,10 +1,10 @@ |
|||
import api from 'themes/glitch/util/api'; |
|||
import api from 'flavours/glitch/util/api'; |
|||
|
|||
export const PINNED_STATUSES_FETCH_REQUEST = 'PINNED_STATUSES_FETCH_REQUEST'; |
|||
export const PINNED_STATUSES_FETCH_SUCCESS = 'PINNED_STATUSES_FETCH_SUCCESS'; |
|||
export const PINNED_STATUSES_FETCH_FAIL = 'PINNED_STATUSES_FETCH_FAIL'; |
|||
|
|||
import { me } from 'themes/glitch/util/initial_state'; |
|||
import { me } from 'flavours/glitch/util/initial_state'; |
|||
|
|||
export function fetchPinnedStatuses() { |
|||
return (dispatch, getState) => { |
@ -1,4 +1,4 @@ |
|||
import api from 'themes/glitch/util/api'; |
|||
import api from 'flavours/glitch/util/api'; |
|||
import { openModal, closeModal } from './modal'; |
|||
|
|||
export const REPORT_INIT = 'REPORT_INIT'; |
@ -1,4 +1,4 @@ |
|||
import api from 'themes/glitch/util/api'; |
|||
import api from 'flavours/glitch/util/api'; |
|||
|
|||
export const SEARCH_CHANGE = 'SEARCH_CHANGE'; |
|||
export const SEARCH_CLEAR = 'SEARCH_CLEAR'; |
@ -1,4 +1,4 @@ |
|||
import api from 'themes/glitch/util/api'; |
|||
import api from 'flavours/glitch/util/api'; |
|||
|
|||
import { deleteFromTimelines } from './timelines'; |
|||
import { fetchStatusCard } from './cards'; |
@ -1,4 +1,4 @@ |
|||
import { connectStream } from 'themes/glitch/util/stream'; |
|||
import { connectStream } from 'flavours/glitch/util/stream'; |
|||
import { |
|||
updateTimeline, |
|||
deleteFromTimelines, |
@ -1,4 +1,4 @@ |
|||
import api, { getLinks } from 'themes/glitch/util/api'; |
|||
import api, { getLinks } from 'flavours/glitch/util/api'; |
|||
import { Map as ImmutableMap, List as ImmutableList } from 'immutable'; |
|||
|
|||
export const TIMELINE_UPDATE = 'TIMELINE_UPDATE'; |
@ -1,6 +1,6 @@ |
|||
import React from 'react'; |
|||
import PropTypes from 'prop-types'; |
|||
import unicodeMapping from 'themes/glitch/util/emoji/emoji_unicode_mapping_light'; |
|||
import unicodeMapping from 'flavours/glitch/util/emoji/emoji_unicode_mapping_light'; |
|||
|
|||
const assetHost = process.env.CDN_HOST || ''; |
|||
|
@ -1,9 +1,9 @@ |
|||
import React from 'react'; |
|||
import AutosuggestAccountContainer from 'themes/glitch/features/compose/containers/autosuggest_account_container'; |
|||
import AutosuggestAccountContainer from 'flavours/glitch/features/compose/containers/autosuggest_account_container'; |
|||
import AutosuggestEmoji from './autosuggest_emoji'; |
|||
import ImmutablePropTypes from 'react-immutable-proptypes'; |
|||
import PropTypes from 'prop-types'; |
|||
import { isRtl } from 'themes/glitch/util/rtl'; |
|||
import { isRtl } from 'flavours/glitch/util/rtl'; |
|||
import ImmutablePureComponent from 'react-immutable-pure-component'; |
|||
import Textarea from 'react-textarea-autosize'; |
|||
import classNames from 'classnames'; |
@ -1,5 +1,5 @@ |
|||
import React from 'react'; |
|||
import Motion from 'themes/glitch/util/optional_motion'; |
|||
import Motion from 'flavours/glitch/util/optional_motion'; |
|||
import spring from 'react-motion/lib/spring'; |
|||
import PropTypes from 'prop-types'; |
|||
|
@ -1,7 +1,7 @@ |
|||
import React from 'react'; |
|||
import PropTypes from 'prop-types'; |
|||
import detectPassiveEvents from 'detect-passive-events'; |
|||
import { scrollTop } from 'themes/glitch/util/scroll'; |
|||
import { scrollTop } from 'flavours/glitch/util/scroll'; |
|||
|
|||
export default class Column extends React.PureComponent { |
|||
|
@ -1,5 +1,5 @@ |
|||
import React from 'react'; |
|||
import Motion from 'themes/glitch/util/optional_motion'; |
|||
import Motion from 'flavours/glitch/util/optional_motion'; |
|||
import spring from 'react-motion/lib/spring'; |
|||
import PropTypes from 'prop-types'; |
|||
import classNames from 'classnames'; |
@ -1,7 +1,7 @@ |
|||
import React from 'react'; |
|||
import PropTypes from 'prop-types'; |
|||
import scheduleIdleTask from 'themes/glitch/util/schedule_idle_task'; |
|||
import getRectFromEntry from 'themes/glitch/util/get_rect_from_entry'; |
|||
import scheduleIdleTask from 'flavours/glitch/util/schedule_idle_task'; |
|||
import getRectFromEntry from 'flavours/glitch/util/get_rect_from_entry'; |
|||
import { is } from 'immutable'; |
|||
|
|||
// Diff these props in the "rendered" state
|
@ -1,13 +1,13 @@ |
|||
import React, { PureComponent } from 'react'; |
|||
import { ScrollContainer } from 'react-router-scroll-4'; |
|||
import PropTypes from 'prop-types'; |
|||
import IntersectionObserverArticleContainer from 'themes/glitch/containers/intersection_observer_article_container'; |
|||
import IntersectionObserverArticleContainer from 'flavours/glitch/containers/intersection_observer_article_container'; |
|||
import LoadMore from './load_more'; |
|||
import IntersectionObserverWrapper from 'themes/glitch/util/intersection_observer_wrapper'; |
|||
import IntersectionObserverWrapper from 'flavours/glitch/util/intersection_observer_wrapper'; |
|||
import { throttle } from 'lodash'; |
|||
import { List as ImmutableList } from 'immutable'; |
|||
import classNames from 'classnames'; |
|||
import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from 'themes/glitch/util/fullscreen'; |
|||
import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from 'flavours/glitch/util/fullscreen'; |
|||
|
|||
export default class ScrollableList extends PureComponent { |
|||
|
@ -1,14 +1,11 @@ |
|||
// THIS FILE EXISTS FOR UPSTREAM COMPATIBILITY & SHOULDN'T BE USED !!
|
|||
// SEE INSTEAD : glitch/components/status/action_bar
|
|||
|
|||
import React from 'react'; |
|||
import ImmutablePropTypes from 'react-immutable-proptypes'; |
|||
import PropTypes from 'prop-types'; |
|||
import IconButton from './icon_button'; |
|||
import DropdownMenuContainer from 'themes/glitch/containers/dropdown_menu_container'; |
|||
import DropdownMenuContainer from 'flavours/glitch/containers/dropdown_menu_container'; |
|||
import { defineMessages, injectIntl } from 'react-intl'; |
|||
import ImmutablePureComponent from 'react-immutable-pure-component'; |
|||
import { me } from 'themes/glitch/util/initial_state'; |
|||
import { me } from 'flavours/glitch/util/initial_state'; |
|||
import RelativeTimestamp from './relative_timestamp'; |
|||
|
|||
const messages = defineMessages({ |
@ -1,7 +1,7 @@ |
|||
import React from 'react'; |
|||
import ImmutablePropTypes from 'react-immutable-proptypes'; |
|||
import PropTypes from 'prop-types'; |
|||
import { isRtl } from 'themes/glitch/util/rtl'; |
|||
import { isRtl } from 'flavours/glitch/util/rtl'; |
|||
import { FormattedMessage } from 'react-intl'; |
|||
import Permalink from './permalink'; |
|||
import classnames from 'classnames'; |
@ -1,7 +1,7 @@ |
|||
import React from 'react'; |
|||
import ImmutablePropTypes from 'react-immutable-proptypes'; |
|||
import PropTypes from 'prop-types'; |
|||
import StatusContainer from 'themes/glitch/containers/status_container'; |
|||
import StatusContainer from 'flavours/glitch/containers/status_container'; |
|||
import ImmutablePureComponent from 'react-immutable-pure-component'; |
|||
import ScrollableList from './scrollable_list'; |
|||
|
@ -1,6 +1,6 @@ |
|||
import React from 'react'; |
|||
import PropTypes from 'prop-types'; |
|||
import Card from 'themes/glitch/features/status/components/card'; |
|||
import Card from 'flavours/glitch/features/status/components/card'; |
|||
import { fromJS } from 'immutable'; |
|||
|
|||
export default class CardContainer extends React.PureComponent { |
@ -1,12 +1,12 @@ |
|||
import React from 'react'; |
|||
import { Provider } from 'react-redux'; |
|||
import PropTypes from 'prop-types'; |
|||
import configureStore from 'themes/glitch/store/configureStore'; |
|||
import { hydrateStore } from 'themes/glitch/actions/store'; |
|||
import configureStore from 'flavours/glitch/store/configureStore'; |
|||
import { hydrateStore } from 'flavours/glitch/actions/store'; |
|||
import { IntlProvider, addLocaleData } from 'react-intl'; |
|||
import { getLocale } from 'mastodon/locales'; |
|||
import Compose from 'themes/glitch/features/standalone/compose'; |
|||
import initialState from 'themes/glitch/util/initial_state'; |
|||
import Compose from 'flavours/glitch/features/standalone/compose'; |
|||
import initialState from 'flavours/glitch/util/initial_state'; |
|||
|
|||
const { localeData, messages } = getLocale(); |
|||
addLocaleData(localeData); |
@ -1,7 +1,7 @@ |
|||
import { openModal, closeModal } from 'themes/glitch/actions/modal'; |
|||
import { openModal, closeModal } from 'flavours/glitch/actions/modal'; |
|||
import { connect } from 'react-redux'; |
|||
import DropdownMenu from 'themes/glitch/components/dropdown_menu'; |
|||
import { isUserTouching } from 'themes/glitch/util/is_mobile'; |
|||
import DropdownMenu from 'flavours/glitch/components/dropdown_menu'; |
|||
import { isUserTouching } from 'flavours/glitch/util/is_mobile'; |
|||
|
|||
const mapStateToProps = state => ({ |
|||
isModalOpen: state.get('modal').modalType === 'ACTIONS', |
@ -1,6 +1,6 @@ |
|||
import { connect } from 'react-redux'; |
|||
import IntersectionObserverArticle from 'themes/glitch/components/intersection_observer_article'; |
|||
import { setHeight } from 'themes/glitch/actions/height_cache'; |
|||
import IntersectionObserverArticle from 'flavours/glitch/components/intersection_observer_article'; |
|||
import { setHeight } from 'flavours/glitch/actions/height_cache'; |
|||
|
|||
const makeMapStateToProps = (state, props) => ({ |
|||
cachedHeight: state.getIn(['height_cache', props.saveHeightKey, props.id]), |
@ -1,16 +1,16 @@ |
|||
import React from 'react'; |
|||
import { Provider } from 'react-redux'; |
|||
import PropTypes from 'prop-types'; |
|||
import configureStore from 'themes/glitch/store/configureStore'; |
|||
import { showOnboardingOnce } from 'themes/glitch/actions/onboarding'; |
|||
import configureStore from 'flavours/glitch/store/configureStore'; |
|||
import { showOnboardingOnce } from 'flavours/glitch/actions/onboarding'; |
|||
import { BrowserRouter, Route } from 'react-router-dom'; |
|||
import { ScrollContext } from 'react-router-scroll-4'; |
|||
import UI from 'themes/glitch/features/ui'; |
|||
import { hydrateStore } from 'themes/glitch/actions/store'; |
|||
import { connectUserStream } from 'themes/glitch/actions/streaming'; |
|||
import UI from 'flavours/glitch/features/ui'; |
|||
import { hydrateStore } from 'flavours/glitch/actions/store'; |
|||
import { connectUserStream } from 'flavours/glitch/actions/streaming'; |
|||
import { IntlProvider, addLocaleData } from 'react-intl'; |
|||
import { getLocale } from 'locales'; |
|||
import initialState from 'themes/glitch/util/initial_state'; |
|||
import initialState from 'flavours/glitch/util/initial_state'; |
|||
|
|||
const { localeData, messages } = getLocale(); |
|||
addLocaleData(localeData); |
@ -1,13 +1,13 @@ |
|||
import React from 'react'; |
|||
import { Provider } from 'react-redux'; |
|||
import PropTypes from 'prop-types'; |
|||
import configureStore from 'themes/glitch/store/configureStore'; |
|||
import { hydrateStore } from 'themes/glitch/actions/store'; |
|||
import configureStore from 'flavours/glitch/store/configureStore'; |
|||
import { hydrateStore } from 'flavours/glitch/actions/store'; |
|||
import { IntlProvider, addLocaleData } from 'react-intl'; |
|||
import { getLocale } from 'mastodon/locales'; |
|||
import PublicTimeline from 'themes/glitch/features/standalone/public_timeline'; |
|||
import HashtagTimeline from 'themes/glitch/features/standalone/hashtag_timeline'; |
|||
import initialState from 'themes/glitch/util/initial_state'; |
|||
import PublicTimeline from 'flavours/glitch/features/standalone/public_timeline'; |
|||
import HashtagTimeline from 'flavours/glitch/features/standalone/hashtag_timeline'; |
|||
import initialState from 'flavours/glitch/util/initial_state'; |
|||
|
|||
const { localeData, messages } = getLocale(); |
|||
addLocaleData(localeData); |
@ -1,10 +1,10 @@ |
|||
import React from 'react'; |
|||
import ImmutablePropTypes from 'react-immutable-proptypes'; |
|||
import PropTypes from 'prop-types'; |
|||
import DropdownMenuContainer from 'themes/glitch/containers/dropdown_menu_container'; |
|||
import DropdownMenuContainer from 'flavours/glitch/containers/dropdown_menu_container'; |
|||
import { Link } from 'react-router-dom'; |
|||
import { defineMessages, injectIntl, FormattedMessage, FormattedNumber } from 'react-intl'; |
|||
import { me } from 'themes/glitch/util/initial_state'; |
|||
import { me } from 'flavours/glitch/util/initial_state'; |
|||
|
|||
const messages = defineMessages({ |
|||
mention: { id: 'account.mention', defaultMessage: 'Mention @{name}' }, |
@ -1,7 +1,7 @@ |
|||
import React from 'react'; |
|||
import ImmutablePropTypes from 'react-immutable-proptypes'; |
|||
import ImmutablePureComponent from 'react-immutable-pure-component'; |
|||
import Permalink from 'themes/glitch/components/permalink'; |
|||
import Permalink from 'flavours/glitch/components/permalink'; |
|||
|
|||
export default class MediaItem extends ImmutablePureComponent { |
|||
|
@ -1,9 +1,9 @@ |
|||
import React from 'react'; |
|||
import ImmutablePropTypes from 'react-immutable-proptypes'; |
|||
import PropTypes from 'prop-types'; |
|||
import InnerHeader from 'themes/glitch/features/account/components/header'; |
|||
import ActionBar from 'themes/glitch/features/account/components/action_bar'; |
|||
import MissingIndicator from 'themes/glitch/components/missing_indicator'; |
|||
import InnerHeader from 'flavours/glitch/features/account/components/header'; |
|||
import ActionBar from 'flavours/glitch/features/account/components/action_bar'; |
|||
import MissingIndicator from 'flavours/glitch/components/missing_indicator'; |
|||
import ImmutablePureComponent from 'react-immutable-pure-component'; |
|||
|
|||
export default class Header extends ImmutablePureComponent { |
@ -1,6 +1,6 @@ |
|||
import { connect } from 'react-redux'; |
|||
import ColumnSettings from '../components/column_settings'; |
|||
import { changeSetting } from 'themes/glitch/actions/settings'; |
|||
import { changeSetting } from 'flavours/glitch/actions/settings'; |
|||
|
|||
const mapStateToProps = state => ({ |
|||
settings: state.getIn(['settings', 'community']), |
@ -1,17 +1,17 @@ |
|||
import React from 'react'; |
|||
import { connect } from 'react-redux'; |
|||
import PropTypes from 'prop-types'; |
|||
import StatusListContainer from 'themes/glitch/features/ui/containers/status_list_container'; |
|||
import Column from 'themes/glitch/components/column'; |
|||
import ColumnHeader from 'themes/glitch/components/column_header'; |
|||
import StatusListContainer from 'flavours/glitch/features/ui/containers/status_list_container'; |
|||
import Column from 'flavours/glitch/components/column'; |
|||
import ColumnHeader from 'flavours/glitch/components/column_header'; |
|||
import { |
|||
refreshCommunityTimeline, |
|||
expandCommunityTimeline, |
|||
} from 'themes/glitch/actions/timelines'; |
|||
import { addColumn, removeColumn, moveColumn } from 'themes/glitch/actions/columns'; |
|||
} from 'flavours/glitch/actions/timelines'; |
|||
import { addColumn, removeColumn, moveColumn } from 'flavours/glitch/actions/columns'; |
|||
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; |
|||
import ColumnSettingsContainer from './containers/column_settings_container'; |
|||
import { connectCommunityStream } from 'themes/glitch/actions/streaming'; |
|||
import { connectCommunityStream } from 'flavours/glitch/actions/streaming'; |
|||
|
|||
const messages = defineMessages({ |
|||
title: { id: 'column.community', defaultMessage: 'Local timeline' }, |
@ -1,6 +1,6 @@ |
|||
import React from 'react'; |
|||
import Avatar from 'themes/glitch/components/avatar'; |
|||
import DisplayName from 'themes/glitch/components/display_name'; |
|||
import Avatar from 'flavours/glitch/components/avatar'; |
|||
import DisplayName from 'flavours/glitch/components/display_name'; |
|||
import ImmutablePropTypes from 'react-immutable-proptypes'; |
|||
import ImmutablePureComponent from 'react-immutable-pure-component'; |
|||
|
@ -1,12 +1,12 @@ |
|||
import React from 'react'; |
|||
import PropTypes from 'prop-types'; |
|||
import { defineMessages, injectIntl } from 'react-intl'; |
|||
import { EmojiPicker as EmojiPickerAsync } from 'themes/glitch/util/async-components'; |
|||
import { EmojiPicker as EmojiPickerAsync } from 'flavours/glitch/util/async-components'; |
|||
import Overlay from 'react-overlays/lib/Overlay'; |
|||
import classNames from 'classnames'; |
|||
import ImmutablePropTypes from 'react-immutable-proptypes'; |
|||
import detectPassiveEvents from 'detect-passive-events'; |
|||
import { buildCustomEmojis } from 'themes/glitch/util/emoji'; |
|||
import { buildCustomEmojis } from 'flavours/glitch/util/emoji'; |
|||
|
|||
const messages = defineMessages({ |
|||
emoji: { id: 'emoji_button.label', defaultMessage: 'Insert emoji' }, |
@ -1,9 +1,9 @@ |
|||
import React from 'react'; |
|||
import PropTypes from 'prop-types'; |
|||
import ImmutablePropTypes from 'react-immutable-proptypes'; |
|||
import Avatar from 'themes/glitch/components/avatar'; |
|||
import IconButton from 'themes/glitch/components/icon_button'; |
|||
import Permalink from 'themes/glitch/components/permalink'; |
|||
import Avatar from 'flavours/glitch/components/avatar'; |
|||
import IconButton from 'flavours/glitch/components/icon_button'; |
|||
import Permalink from 'flavours/glitch/components/permalink'; |
|||
import { FormattedMessage } from 'react-intl'; |
|||
import ImmutablePureComponent from 'react-immutable-pure-component'; |
|||
|
@ -1,9 +1,9 @@ |
|||
import React from 'react'; |
|||
import PropTypes from 'prop-types'; |
|||
import { injectIntl, defineMessages } from 'react-intl'; |
|||
import IconButton from 'themes/glitch/components/icon_button'; |
|||
import IconButton from 'flavours/glitch/components/icon_button'; |
|||
import Overlay from 'react-overlays/lib/Overlay'; |
|||
import Motion from 'themes/glitch/util/optional_motion'; |
|||
import Motion from 'flavours/glitch/util/optional_motion'; |
|||
import spring from 'react-motion/lib/spring'; |
|||
import detectPassiveEvents from 'detect-passive-events'; |
|||
import classNames from 'classnames'; |
@ -1,9 +1,9 @@ |
|||
import React from 'react'; |
|||
import ImmutablePropTypes from 'react-immutable-proptypes'; |
|||
import PropTypes from 'prop-types'; |
|||
import Avatar from 'themes/glitch/components/avatar'; |
|||
import IconButton from 'themes/glitch/components/icon_button'; |
|||
import DisplayName from 'themes/glitch/components/display_name'; |
|||
import Avatar from 'flavours/glitch/components/avatar'; |
|||
import IconButton from 'flavours/glitch/components/icon_button'; |
|||
import DisplayName from 'flavours/glitch/components/display_name'; |
|||
import { defineMessages, injectIntl } from 'react-intl'; |
|||
import ImmutablePureComponent from 'react-immutable-pure-component'; |
|||
|
@ -1,8 +1,8 @@ |
|||
import React from 'react'; |
|||
import ImmutablePropTypes from 'react-immutable-proptypes'; |
|||
import { FormattedMessage } from 'react-intl'; |
|||
import AccountContainer from 'themes/glitch/containers/account_container'; |
|||
import StatusContainer from 'themes/glitch/containers/status_container'; |
|||
import AccountContainer from 'flavours/glitch/containers/account_container'; |
|||
import StatusContainer from 'flavours/glitch/containers/status_container'; |
|||
import { Link } from 'react-router-dom'; |
|||
import ImmutablePureComponent from 'react-immutable-pure-component'; |
|||
|
@ -1,8 +1,8 @@ |
|||
import React from 'react'; |
|||
import ImmutablePropTypes from 'react-immutable-proptypes'; |
|||
import PropTypes from 'prop-types'; |
|||
import IconButton from 'themes/glitch/components/icon_button'; |
|||
import Motion from 'themes/glitch/util/optional_motion'; |
|||
import IconButton from 'flavours/glitch/components/icon_button'; |
|||
import Motion from 'flavours/glitch/util/optional_motion'; |
|||
import spring from 'react-motion/lib/spring'; |
|||
import ImmutablePureComponent from 'react-immutable-pure-component'; |
|||
import { defineMessages, injectIntl } from 'react-intl'; |
@ -1,5 +1,5 @@ |
|||
import React from 'react'; |
|||
import IconButton from 'themes/glitch/components/icon_button'; |
|||
import IconButton from 'flavours/glitch/components/icon_button'; |
|||
import PropTypes from 'prop-types'; |
|||
import { defineMessages, injectIntl } from 'react-intl'; |
|||
import { connect } from 'react-redux'; |
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue