mirror of https://github.com/mastodon/mastodon.git
Fix import loop
parent
aac2f1e9ba
commit
a4ba310adf
|
@ -24,8 +24,6 @@ import { saveSettings } from './settings';
|
||||||
|
|
||||||
export * from "./notifications_typed";
|
export * from "./notifications_typed";
|
||||||
|
|
||||||
export { clearNotifications } from "./notification_groups";
|
|
||||||
|
|
||||||
export const NOTIFICATIONS_UPDATE_NOOP = 'NOTIFICATIONS_UPDATE_NOOP';
|
export const NOTIFICATIONS_UPDATE_NOOP = 'NOTIFICATIONS_UPDATE_NOOP';
|
||||||
|
|
||||||
export const NOTIFICATIONS_EXPAND_REQUEST = 'NOTIFICATIONS_EXPAND_REQUEST';
|
export const NOTIFICATIONS_EXPAND_REQUEST = 'NOTIFICATIONS_EXPAND_REQUEST';
|
||||||
|
|
|
@ -4,8 +4,9 @@ import { connect } from 'react-redux';
|
||||||
|
|
||||||
import { showAlert } from '../../../actions/alerts';
|
import { showAlert } from '../../../actions/alerts';
|
||||||
import { openModal } from '../../../actions/modal';
|
import { openModal } from '../../../actions/modal';
|
||||||
|
import { clearNotifications } from '../../../actions/notification_groups';
|
||||||
import { updateNotificationsPolicy } from '../../../actions/notification_policies';
|
import { updateNotificationsPolicy } from '../../../actions/notification_policies';
|
||||||
import { setFilter, clearNotifications, requestBrowserPermission } from '../../../actions/notifications';
|
import { setFilter, requestBrowserPermission } from '../../../actions/notifications';
|
||||||
import { changeAlerts as changePushNotifications } from '../../../actions/push_notifications';
|
import { changeAlerts as changePushNotifications } from '../../../actions/push_notifications';
|
||||||
import { changeSetting } from '../../../actions/settings';
|
import { changeSetting } from '../../../actions/settings';
|
||||||
import ColumnSettings from '../components/column_settings';
|
import ColumnSettings from '../components/column_settings';
|
||||||
|
|
|
@ -16,6 +16,7 @@ import {
|
||||||
import {
|
import {
|
||||||
fetchMarkers,
|
fetchMarkers,
|
||||||
} from '../actions/markers';
|
} from '../actions/markers';
|
||||||
|
import { clearNotifications } from '../actions/notification_groups';
|
||||||
import {
|
import {
|
||||||
notificationsUpdate,
|
notificationsUpdate,
|
||||||
NOTIFICATIONS_EXPAND_SUCCESS,
|
NOTIFICATIONS_EXPAND_SUCCESS,
|
||||||
|
@ -29,7 +30,6 @@ import {
|
||||||
NOTIFICATIONS_MARK_AS_READ,
|
NOTIFICATIONS_MARK_AS_READ,
|
||||||
NOTIFICATIONS_SET_BROWSER_SUPPORT,
|
NOTIFICATIONS_SET_BROWSER_SUPPORT,
|
||||||
NOTIFICATIONS_SET_BROWSER_PERMISSION,
|
NOTIFICATIONS_SET_BROWSER_PERMISSION,
|
||||||
clearNotifications,
|
|
||||||
} from '../actions/notifications';
|
} from '../actions/notifications';
|
||||||
import { disconnectTimeline } from '../actions/timelines';
|
import { disconnectTimeline } from '../actions/timelines';
|
||||||
import { compareId } from '../compare_id';
|
import { compareId } from '../compare_id';
|
||||||
|
|
Loading…
Reference in New Issue