@@ -106,6 +109,10 @@ class ColumnSettings extends React.PureComponent {
{this.modeSelect('none')}
)}
+
+
+ } />
+
);
}
diff --git a/app/javascript/mastodon/features/hashtag_timeline/index.js b/app/javascript/mastodon/features/hashtag_timeline/index.js
index 28200e6c21f..3e06e3652c6 100644
--- a/app/javascript/mastodon/features/hashtag_timeline/index.js
+++ b/app/javascript/mastodon/features/hashtag_timeline/index.js
@@ -98,21 +98,21 @@ class HashtagTimeline extends React.PureComponent {
componentDidMount () {
const { dispatch } = this.props;
- const { id, tags } = this.props.params;
+ const { id, tags, local } = this.props.params;
this._subscribe(dispatch, id, tags);
- dispatch(expandHashtagTimeline(id, { tags }));
+ dispatch(expandHashtagTimeline(id, { tags, local }));
}
componentWillReceiveProps (nextProps) {
const { dispatch, params } = this.props;
- const { id, tags } = nextProps.params;
+ const { id, tags, local } = nextProps.params;
- if (id !== params.id || !isEqual(tags, params.tags)) {
+ if (id !== params.id || !isEqual(tags, params.tags) || !isEqual(local, params.local)) {
this._unsubscribe();
this._subscribe(dispatch, id, tags);
- this.props.dispatch(clearTimeline(`hashtag:${id}`));
- this.props.dispatch(expandHashtagTimeline(id, { tags }));
+ dispatch(clearTimeline(`hashtag:${id}`));
+ dispatch(expandHashtagTimeline(id, { tags, local }));
}
}
@@ -125,8 +125,8 @@ class HashtagTimeline extends React.PureComponent {
}
handleLoadMore = maxId => {
- const { id, tags } = this.props.params;
- this.props.dispatch(expandHashtagTimeline(id, { maxId, tags }));
+ const { id, tags, local } = this.props.params;
+ this.props.dispatch(expandHashtagTimeline(id, { maxId, tags, local }));
}
render () {
diff --git a/app/javascript/mastodon/features/standalone/hashtag_timeline/index.js b/app/javascript/mastodon/features/standalone/hashtag_timeline/index.js
index 73919c39dd4..d3d8a6507e6 100644
--- a/app/javascript/mastodon/features/standalone/hashtag_timeline/index.js
+++ b/app/javascript/mastodon/features/standalone/hashtag_timeline/index.js
@@ -24,19 +24,25 @@ class HashtagTimeline extends React.PureComponent {
isLoading: PropTypes.bool.isRequired,
hasMore: PropTypes.bool.isRequired,
hashtag: PropTypes.string.isRequired,
+ local: PropTypes.bool.isRequired,
+ };
+
+ static defaultProps = {
+ local: false,
};
componentDidMount () {
- const { dispatch, hashtag } = this.props;
+ const { dispatch, hashtag, local } = this.props;
- dispatch(expandHashtagTimeline(hashtag));
+ dispatch(expandHashtagTimeline(hashtag, { local }));
}
handleLoadMore = () => {
- const maxId = this.props.statusIds.last();
+ const { dispatch, hashtag, local, statusIds } = this.props;
+ const maxId = statusIds.last();
if (maxId) {
- this.props.dispatch(expandHashtagTimeline(this.props.hashtag, { maxId }));
+ dispatch(expandHashtagTimeline(hashtag, { maxId, local }));
}
}
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml
index 7413be1db97..841c01fd7b6 100644
--- a/app/views/settings/profiles/show.html.haml
+++ b/app/views/settings/profiles/show.html.haml
@@ -17,9 +17,9 @@
= render 'application/card', account: @account
.fields-row__column.fields-group.fields-row__column-6
- = f.input :header, wrapper: :with_label, input_html: { accept: AccountHeader::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.header', dimensions: '1500x500', size: number_to_human_size(AccountHeader::LIMIT))
+ = f.input :header, wrapper: :with_label, input_html: { accept: AccountHeader::IMAGE_MIME_TYPES.join(',') }, hint: picture_hint(t('simple_form.hints.defaults.header', dimensions: '1500x500', size: number_to_human_size(AccountHeader::LIMIT)), @account.header)
- = f.input :avatar, wrapper: :with_label, input_html: { accept: AccountAvatar::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.avatar', dimensions: '400x400', size: number_to_human_size(AccountAvatar::LIMIT))
+ = f.input :avatar, wrapper: :with_label, input_html: { accept: AccountAvatar::IMAGE_MIME_TYPES.join(',') }, hint: picture_hint(t('simple_form.hints.defaults.avatar', dimensions: '400x400', size: number_to_human_size(AccountAvatar::LIMIT)), @account.avatar)
%hr.spacer/
diff --git a/app/views/tags/show.html.haml b/app/views/tags/show.html.haml
index 74d44bd7b29..d15f119ed04 100644
--- a/app/views/tags/show.html.haml
+++ b/app/views/tags/show.html.haml
@@ -11,5 +11,5 @@
%h1= "##{@tag.name}"
%p= t('about.about_hashtag_html', hashtag: @tag.name)
-#mastodon-timeline{ data: { props: Oj.dump(default_props.merge(hashtag: @tag.name)) }}
+#mastodon-timeline{ data: { props: Oj.dump(default_props.merge(hashtag: @tag.name, local: @local)) }}
#modal-container
diff --git a/config/routes.rb b/config/routes.rb
index 450d3222fe9..2ebe12f5c10 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -100,7 +100,9 @@ Rails.application.routes.draw do
get '/settings', to: redirect('/settings/profile')
namespace :settings do
- resource :profile, only: [:show, :update]
+ resource :profile, only: [:show, :update] do
+ resources :pictures, only: :destroy
+ end
get :preferences, to: redirect('/settings/preferences/appearance')
diff --git a/lib/tasks/emojis.rake b/lib/tasks/emojis.rake
index 892afd89896..70919fbdb1b 100644
--- a/lib/tasks/emojis.rake
+++ b/lib/tasks/emojis.rake
@@ -15,7 +15,7 @@ end
namespace :emojis do
desc 'Generate a unicode to filename mapping'
task :generate do
- source = 'http://www.unicode.org/Public/emoji/11.0/emoji-test.txt'
+ source = 'http://www.unicode.org/Public/emoji/12.0/emoji-test.txt'
codes = []
dest = Rails.root.join('app', 'javascript', 'mastodon', 'features', 'emoji', 'emoji_map.json')
diff --git a/public/emoji/1f3c3-1f3fb.svg b/public/emoji/1f3c3-1f3fb.svg
index 604a0024c22..c650508dae4 100644
--- a/public/emoji/1f3c3-1f3fb.svg
+++ b/public/emoji/1f3c3-1f3fb.svg
@@ -1 +1 @@
-