random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into develop

Browse Source
This commit is contained in:
robcolbert 2019-07-03 22:58:10 -04:00
commit adeab79645
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/gabsocial/features/account/components/header.js
View File

@ -290,12 +290,12 @@ class Header extends ImmutablePureComponent {
<div> <div>
<NavLink exact activeClassName='active' to={`/${account.get('acct')}/favorites`} title={intl.formatNumber(account.get('favourite_count'))}> <NavLink exact activeClassName='active' to={`/${account.get('acct')}/favorites`} title={intl.formatNumber(account.get('favourite_count'))}>
{ /* : TODO : shortNumberFormat(account.get('favourite_count')) */ } { /* : TODO : shortNumberFormat(account.get('favourite_count')) */ }
<span>[--]</span> <span>•</span>
<FormattedMessage id='navigation_bar.favourites' defaultMessage='Favorites' /> <FormattedMessage id='navigation_bar.favourites' defaultMessage='Favorites' />
</NavLink> </NavLink>
<NavLink exact activeClassName='active' to={`/${account.get('acct')}/pins`} title={intl.formatNumber(account.get('pinned_count'))}> <NavLink exact activeClassName='active' to={`/${account.get('acct')}/pins`} title={intl.formatNumber(account.get('pinned_count'))}>
{ /* : TODO : shortNumberFormat(account.get('pinned_count')) */ } { /* : TODO : shortNumberFormat(account.get('pinned_count')) */ }
<span>[--]</span> <span>•</span>
<FormattedMessage id='navigation_bar.pins' defaultMessage='Pins' /> <FormattedMessage id='navigation_bar.pins' defaultMessage='Pins' />
</NavLink> </NavLink>
</div> </div>

2
app/javascript/gabsocial/features/favourited_statuses/index.js
View File

@ -14,7 +14,7 @@ import MissingIndicator from 'gabsocial/components/missing_indicator';
const mapStateToProps = (state, { params: { username } }) => { const mapStateToProps = (state, { params: { username } }) => {
return { return {
isMyAccount: (username.toLowercase() === meUsername.toLowerCase()), isMyAccount: (username.toLowerCase() === meUsername.toLowerCase()),
statusIds: state.getIn(['status_lists', 'favourites', 'items']), statusIds: state.getIn(['status_lists', 'favourites', 'items']),
isLoading: state.getIn(['status_lists', 'favourites', 'isLoading'], true), isLoading: state.getIn(['status_lists', 'favourites', 'isLoading'], true),
hasMore: !!state.getIn(['status_lists', 'favourites', 'next']), hasMore: !!state.getIn(['status_lists', 'favourites', 'next']),

2
app/javascript/gabsocial/features/pinned_statuses/index.js
View File

@ -12,7 +12,7 @@ import MissingIndicator from 'gabsocial/components/missing_indicator';
const mapStateToProps = (state, { params: { username } }) => { const mapStateToProps = (state, { params: { username } }) => {
return { return {
isMyAccount: (username.toLowercase() === meUsername.toLowerCase()), isMyAccount: (username.toLowerCase() === meUsername.toLowerCase()),
statusIds: state.getIn(['status_lists', 'pins', 'items']), statusIds: state.getIn(['status_lists', 'pins', 'items']),
hasMore: !!state.getIn(['status_lists', 'pins', 'next']), hasMore: !!state.getIn(['status_lists', 'pins', 'next']),
}; };