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

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
	app/models/user.rb

Resolved by adding :default_language to user settings fields
This commit is contained in:
Thibaut Girka
2018-06-21 20:49:57 +02:00
parent 26c20a4ec7 7f59206944
commit ab5f450700
129 changed files with 1169 additions and 576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/mastodon/features/account/components/action_bar.js
View File

@@ -140,10 +140,6 @@ export default class ActionBar extends React.PureComponent {
{extraInfo}
<div className='account__action-bar'>
<div className='account__action-bar-dropdown'>
<DropdownMenuContainer items={menu} icon='bars' size={24} direction='right' />
</div>
<div className='account__action-bar-links'>
<Link className='account__action-bar__tab' to={`/accounts/${account.get('id')}`}>
<span><FormattedMessage id='account.posts' defaultMessage='Toots' /></span>
@@ -160,6 +156,10 @@ export default class ActionBar extends React.PureComponent {
<strong>{shortNumberFormat(account.get('followers_count'))}</strong>
</Link>
</div>
<div className='account__action-bar-dropdown'>
<DropdownMenuContainer items={menu} icon='ellipsis-v' size={24} direction='right' />
</div>
</div>
</div>
);

7
app/javascript/mastodon/features/getting_started/index.js
View File

@@ -79,7 +79,7 @@ export default class GettingStarted extends ImmutablePureComponent {
const navItems = [];
let i = 1;
let height = 0;
let height = (multiColumn) ? 0 : 60;
if (multiColumn) {
navItems.push(
@@ -95,7 +95,7 @@ export default class GettingStarted extends ImmutablePureComponent {
navItems.push(
<ColumnLink key={i++} icon='envelope' text={intl.formatMessage(messages.direct)} to='/timelines/direct' />,
<ColumnLink key={i++} icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' />,
<ColumnLink key={i++} icon='bars' text={intl.formatMessage(messages.lists)} to='/lists' />
<ColumnLink key={i++} icon='list-ul' text={intl.formatMessage(messages.lists)} to='/lists' />
);
height += 48*3;
@@ -109,10 +109,9 @@ export default class GettingStarted extends ImmutablePureComponent {
navItems.push(
<ColumnSubheading key={i++} text={intl.formatMessage(messages.settings_subheading)} />,
<ColumnLink key={i++} icon='gears' text={intl.formatMessage(messages.preferences)} href='/settings/preferences' />,
<ColumnLink key={i++} icon='lock' text={intl.formatMessage(messages.security)} href='/auth/edit' />
);
height += 34 + 48*2;
height += 34 + 48;
}
return (

2
app/javascript/mastodon/features/list_timeline/index.js
View File

@@ -138,7 +138,7 @@ export default class ListTimeline extends React.PureComponent {
return (
<Column ref={this.setRef}>
<ColumnHeader
icon='bars'
icon='list-ul'
active={hasUnread}
title={title}
onPin={this.handlePin}

4
app/javascript/mastodon/features/lists/index.js
View File

@@ -57,7 +57,7 @@ export default class Lists extends ImmutablePureComponent {
}
return (
<Column icon='bars' heading={intl.formatMessage(messages.heading)}>
<Column icon='list-ul' heading={intl.formatMessage(messages.heading)}>
<ColumnBackButtonSlim />
<NewListForm />
@@ -66,7 +66,7 @@ export default class Lists extends ImmutablePureComponent {
<ColumnSubheading text={intl.formatMessage(messages.subheading)} />
{lists.map(list =>
<ColumnLink key={list.get('id')} to={`/timelines/list/${list.get('id')}`} icon='bars' text={list.get('title')} />
<ColumnLink key={list.get('id')} to={`/timelines/list/${list.get('id')}`} icon='list-ul' text={list.get('title')} />
)}
</div>
</Column>

2
app/javascript/mastodon/features/ui/index.js
View File

@@ -230,7 +230,7 @@ export default class UI extends React.PureComponent {
this.dragTargets.push(e.target);
}
if (e.dataTransfer && e.dataTransfer.types.includes('Files')) {
if (e.dataTransfer && Array.from(e.dataTransfer.types).includes('Files')) {
this.setState({ draggingOver: true });
}
}