autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix #61 - Add list of blocked users to the UI; clean up failed push notifications API

Browse Source 
Try to fix Travis CI setup
This commit is contained in:
Eugen Rochko
2017-02-05 19:18:11 +01:00
parent 77e13c2bc9
commit 920ba5fc4e
16 changed files with 186 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/components/containers/mastodon.jsx
View File

@ -33,6 +33,7 @@ import Notifications from '../features/notifications';
import FollowRequests from '../features/follow_requests';
import GenericNotFound from '../features/generic_not_found';
import FavouritedStatuses from '../features/favourited_statuses';
import Blocks from '../features/blocks';
import { IntlProvider, addLocaleData } from 'react-intl';
import en from 'react-intl/locale-data/en';
import de from 'react-intl/locale-data/de';
@ -124,6 +125,8 @@ const Mastodon = React.createClass({
<Route path='accounts/:accountId/following' component={Following} />
<Route path='follow_requests' component={FollowRequests} />
<Route path='blocks' component={Blocks} />
<Route path='*' component={GenericNotFound} />
</Route>
</Router>