Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IMPORTANT] Squash commits before 2020.11.09 #253

Merged
merged 182 commits into from
Nov 9, 2020
Merged
Changes from 1 commit
Commits
Show all changes
182 commits
Select commit Hold shift + click to select a range
7fc1a89
backup 2020-01-01
mashirozx Jan 1, 2020
74cbe14
Merge branch 'master' of gitee.com:mashirozx/mastodon
mashirozx Feb 9, 2020
fa3f78e
Fix other sessions not being logged out on password change
Gargron Jun 23, 2020
951e997
Change rate limits for various paths
Gargron Jun 23, 2020
2d2e365
Fix media attachment enumeration
ClearlyClaire Jun 22, 2020
661f3f2
Bump version to 3.1.5
Gargron Jul 7, 2020
b9a08dc
Merge pull request #1 from tootsuite/stable-3.1
mashirozx Jul 15, 2020
7fd950d
Merge branch 'master' of github.com:mashirozx/mastodon
mashirozx Jul 15, 2020
192361a
update docker-compose.yml
mashirozx Jul 15, 2020
ef74d6c
update docker-compose.yml
mashirozx Jul 15, 2020
a5815fc
modify MAX_CHARS to 5000
mashirozx Jul 15, 2020
ee9c3aa
add 8 new themes
mashirozx Jul 15, 2020
c3afce4
update fonts
mashirozx Jul 15, 2020
d4c3184
add change poll limit & add a mstd version suffix & add theme
mashirozx Jul 15, 2020
dec72f4
show accurate reply count when it's less or equal than 10
mashirozx Jul 15, 2020
ad4b4f7
format twitter usernames as links
mashirozx Jul 15, 2020
22dceec
show replies only in local timeline for user
mashirozx Jul 15, 2020
de17572
fix status index to allow retoots and replies in local timeline
mashirozx Jul 15, 2020
0463d24
fix reblog availability check
mashirozx Jul 15, 2020
6670b03
Revert commit ad4b4f73fea19632f3667b8df13ad8c69bb4c199, drop reblog c…
mashirozx Jul 16, 2020
88f5828
Revert "Revert commit ad4b4f73fea19632f3667b8df13ad8c69bb4c199, drop …
mashirozx Jul 16, 2020
7e1375f
Revert "fix reblog availability check"
mashirozx Jul 16, 2020
0ae94f1
Revert "fix status index to allow retoots and replies in local timeline"
mashirozx Jul 16, 2020
fd39cda
Revert "show replies only in local timeline for user"
mashirozx Jul 16, 2020
5de46d3
Merge pull request #2 from mashirozx/temp-dev
mashirozx Jul 16, 2020
3abb407
add themes
mashirozx Jul 16, 2020
98c77ee
fix scheme
mashirozx Jul 16, 2020
c2dac0c
Merge branch 'master' of https://github.com/mashirozx/mastodon
mashirozx Jul 16, 2020
63be13f
add request message
mashirozx Jul 16, 2020
8f6207b
MAX_CHARS => 1024
mashirozx Jul 16, 2020
a8336f6
docs mirror
mashirozx Jul 16, 2020
caabc6f
fix typecho
mashirozx Jul 16, 2020
46c789f
Merge pull request #3 from mashirozx/master
mashirozx Jul 16, 2020
6f721b5
commit local changes
mashirozx Jul 16, 2020
485b47c
Merge branch 'dev' of github.com:mashirozx/mastodon into dev
mashirozx Jul 16, 2020
ca32ef3
fix conflict
mashirozx Jul 16, 2020
04ccc8b
Merge branch 'tootsuite-master' into dev
mashirozx Jul 16, 2020
1088764
enhance elasticsearch for Chinese
mashirozx Jul 17, 2020
ce04622
enhance elasticsearch for Chinese
mashirozx Jul 17, 2020
22745e4
Merge pull request #5 from mashirozx/dev
mashirozx Jul 17, 2020
8507e58
install module sidekiq-statistic
mashirozx Jul 18, 2020
82a706a
install module sidekiq-statistic
mashirozx Jul 18, 2020
6d2190f
update application notice
mashirozx Jul 19, 2020
30fb74e
Merge pull request #34 from mashirozx/dev
mashirozx Jul 19, 2020
2f71025
fix eof issye when working on mobile
mashirozx Jul 19, 2020
0a9650d
Merge pull request #67 from tootsuite/master
mashirozx Jul 27, 2020
b060edf
Merge pull request #69 from mashirozx/dev
mashirozx Jul 27, 2020
c4ca056
add ubuntu themes
mashirozx Jul 27, 2020
23dbb67
update ubuntu themes
mashirozx Jul 30, 2020
536d56e
merge conflict
mashirozx Jul 30, 2020
c15d923
show emoji preview
mashirozx Aug 4, 2020
bc02b69
Merge pull request #97 from mashirozx/mashirozx-show-emoji-preview
mashirozx Aug 4, 2020
474357a
enable emoji preview
mashirozx Aug 4, 2020
8e03fb1
restore emoji sheetsize to 32
mashirozx Aug 4, 2020
3ba33f0
Merge pull request #98 from mashirozx/dev
mashirozx Aug 4, 2020
164c16a
move trands position in colum view & enhance themes
mashirozx Aug 7, 2020
e59cfef
Merge pull request #99 from mashirozx/dev
mashirozx Aug 7, 2020
d6124c4
apply new style to show more button
mashirozx Aug 7, 2020
fb45cfc
Merge pull request #100 from mashirozx/dev
mashirozx Aug 7, 2020
24d8599
disable swipeable views on mobile
mashirozx Aug 7, 2020
6685f33
Merge pull request #101 from mashirozx/dev
mashirozx Aug 7, 2020
8c77690
format scss code
mashirozx Aug 7, 2020
69a61a9
add emphasis and code span syntax
mashirozx Aug 8, 2020
fafe372
fix style of show more button for toggling long toot
mashirozx Aug 8, 2020
02b7c62
fix style & add dockerhub workflow
mashirozx Aug 8, 2020
7855f28
add docker build workflow
mashirozx Aug 8, 2020
9384d7b
fix hash and link tag color
mashirozx Aug 9, 2020
84c915b
fix/add pure color schemes & disable developing schemes
mashirozx Aug 9, 2020
47102b0
fix style
mashirozx Aug 9, 2020
edaa20b
add range option for custom_emojis endpoint
mashirozx Aug 9, 2020
737542f
fix style
mashirozx Aug 9, 2020
c539822
MAX_CHARS => 2048
mashirozx Aug 10, 2020
66f5383
disable dependabot
mashirozx Aug 10, 2020
b13c457
full support of Markdown
mashirozx Aug 11, 2020
287edda
add syntax highlight schemes
mashirozx Aug 11, 2020
6bb087f
fix style detail
mashirozx Aug 11, 2020
c6c0e40
Merge pull request #158 from mashirozx/dev
mashirozx Aug 11, 2020
ff6cdd2
update workflow
mashirozx Aug 11, 2020
a8f0025
fix style & add workflow
mashirozx Aug 12, 2020
6135af8
fix workflow
mashirozx Aug 12, 2020
49815a2
update link style
mashirozx Aug 12, 2020
c94a1f5
fix style
mashirozx Aug 12, 2020
233c2d4
Merge pull request #159 from mashirozx/dev
mashirozx Aug 12, 2020
f883ef5
add translate toot button
mashirozx Aug 13, 2020
f4459fe
fix styles
mashirozx Aug 13, 2020
6726828
fix 'gsub' for nil issue in kramdown converter
mashirozx Aug 13, 2020
f4c5634
use POST for translation
mashirozx Aug 14, 2020
9c17da2
fix style crash
mashirozx Aug 14, 2020
e3bcae1
fix style
mashirozx Aug 14, 2020
23ce10b
translation (#160)
mashirozx Aug 14, 2020
9947ef6
merge upstream tootsuite/mastodon:master (#182)
mashirozx Aug 16, 2020
12dd1b3
linitng status_content and minor refactor
xiamx Aug 18, 2020
9e72b61
fix template string for upload_button.label
xiamx Aug 18, 2020
f29d1ad
make translation hidden behind account authentication
xiamx Aug 19, 2020
15d8653
make translation hidden behind account authentication
mashirozx Aug 19, 2020
0ac43d9
fix TRANSLATION_SERVER_HOST
mashirozx Aug 19, 2020
3430cc0
some test
mashirozx Aug 19, 2020
9def57e
handle conflict
mashirozx Aug 19, 2020
f27e408
handle conflict
mashirozx Aug 19, 2020
dc4ce5d
restore translation icon
mashirozx Aug 19, 2020
94179a4
rm duplicate const
mashirozx Aug 19, 2020
2a5e159
optimize translation
mashirozx Aug 20, 2020
3cf5c66
normalize js-side translations
mashirozx Aug 20, 2020
1666af5
Revert "normalize js-side translations"
mashirozx Aug 20, 2020
9052f00
normalize js-side translations
mashirozx Aug 20, 2020
ecbdd47
add translation for zh-HK zh-TW ja
mashirozx Aug 20, 2020
c06c54f
fix translation 已隐藏的媒体内容
mashirozx Aug 20, 2020
63e1e4f
export theme color
mashirozx Aug 20, 2020
a5e3058
export theme color
mashirozx Aug 20, 2020
b4e3da8
export theme color
mashirozx Aug 20, 2020
f843c7b
rm theme
mashirozx Aug 21, 2020
ac18707
fedisearch api integration
xiamx Aug 21, 2020
d6d8e73
Revert "fedisearch api integration"
mashirozx Aug 21, 2020
8df0329
Update simple_form.zh-CN.yml
mashirozx Sep 13, 2020
07edb26
handle conflict
mashirozx Sep 14, 2020
b1e4c5e
require invite_request_fields
mashirozx Sep 14, 2020
b8de049
fix fonts
mashirozx Sep 14, 2020
e16a7a0
Merge remote-tracking branch 'upstream/master' into dev
mashirozx Sep 20, 2020
02a344d
add support for instance local only statuses (#225)
mashirozx Sep 20, 2020
e32d62b
remove dependabot
mashirozx Sep 20, 2020
b5bc72b
limit pinned toots to 6
mashirozx Sep 20, 2020
aff5de1
fix style for local-only
mashirozx Sep 20, 2020
d1ef302
add translation (for local only)
mashirozx Sep 20, 2020
a6a3973
Revert "limit pinned toots to 6"
mashirozx Sep 20, 2020
6e3c0d9
styles and translations for instance local only statuses (#226)
mashirozx Sep 20, 2020
41a0dbe
limit pinned toots to 6
mashirozx Sep 20, 2020
8948103
Merge branch 'master' of https://github.com/mashirozx/mastodon
mashirozx Sep 20, 2020
6f2898c
Update zh-CN.json
mashirozx Sep 20, 2020
39c6867
Merge branch 'dev'
mashirozx Sep 20, 2020
8f8e967
update server side translation
mashirozx Sep 20, 2020
f054522
Merge branch 'dev'
mashirozx Sep 20, 2020
c9916ed
add server side translation
mashirozx Sep 21, 2020
2cbccfa
change FederationDropdownContainer position
mashirozx Sep 21, 2020
a8f84ba
add rich content option support (#228)
mashirozx Sep 29, 2020
70dcbba
add rich content option support (#228)
mashirozx Sep 29, 2020
7c1e6ae
fix bug in compose reducers on reply content_type
mashirozx Sep 30, 2020
cd75c6c
update font-awesome 5 (#231)
mashirozx Oct 6, 2020
8b31838
merge upstream
mashirozx Oct 6, 2020
56f9b7e
fix error in merging
mashirozx Oct 6, 2020
435d5da
Merge branch 'master' into dev
mashirozx Oct 6, 2020
13a2ab5
Merge pull request #230 from mashirozx/dev
mashirozx Oct 6, 2020
d9f8890
update themes
mashirozx Oct 7, 2020
217e65f
update themes (#232)
mashirozx Oct 7, 2020
c1d9995
add & fix themes
mashirozx Oct 9, 2020
aeccdb6
Merge branch 'master' into dev
mashirozx Oct 9, 2020
6271102
update theme
mashirozx Oct 9, 2020
f3f410b
Merge branch 'dev' of github.com:mashirozx/mastodon into dev
mashirozx Oct 9, 2020
6c485bf
add & fix themes (#233)
mashirozx Oct 9, 2020
4926488
fix theme
mashirozx Oct 9, 2020
e024c43
fix theme
mashirozx Oct 9, 2020
3e5636b
handle conflict
mashirozx Oct 13, 2020
abae994
update theme
mashirozx Oct 16, 2020
9e55cba
handle conflict
mashirozx Oct 16, 2020
fe5f6d3
Merge branch 'master' into dev
mashirozx Oct 16, 2020
f9afbd0
merge upstream & update theme (#234)
mashirozx Oct 16, 2020
31f5195
Revert "merge upstream & update theme (#234)" (#235)
mashirozx Oct 16, 2020
110312a
Merge branch 'master' of github.com:mashirozx/mastodon
mashirozx Oct 16, 2020
4acb453
update theme
mashirozx Oct 17, 2020
b2d419d
update theme
mashirozx Oct 17, 2020
27656b4
update theme & enhance hashtag (#236)
mashirozx Oct 17, 2020
48f5a33
accept remote rich content
mashirozx Oct 17, 2020
2e8ab41
add new themes (forest-trace, aurora)
mashirozx Oct 18, 2020
529f433
Merge branch 'dev'
mashirozx Oct 19, 2020
f729b29
handle conflict
mashirozx Oct 19, 2020
6ab7507
enhance transparent theme & hashtag & cw button (#238)
mashirozx Oct 19, 2020
6802694
fix bug handling code block in htmlParser (#239)
mashirozx Oct 21, 2020
e6b45ba
fix style (#240)
mashirozx Oct 21, 2020
efeb038
add hashtag markup (#241)
mashirozx Oct 21, 2020
dd7560e
handle conflict
mashirozx Oct 26, 2020
70fdfc0
merge upstream (bump version to 3.2.1) (#242)
mashirozx Oct 26, 2020
be70c76
Revert "merge upstream (bump version to 3.2.1) (#242)" (#243)
mashirozx Oct 26, 2020
a1632c7
Merge pull request #244 from mashirozx/dev
mashirozx Oct 26, 2020
5fb404a
handle conflict
mashirozx Nov 3, 2020
98fd166
Merge branch 'master' of https://github.com/tootsuite/mastodon
mashirozx Nov 3, 2020
dd16662
Add quote feature (#249)
mashirozx Nov 3, 2020
19c8d15
quote: fix reblog availability check for local only
mashirozx Nov 3, 2020
dc7b06f
Fix null poll
noellabo Nov 12, 2019
3127887
revert add quote feature (qoto ver.) (#251)
mashirozx Nov 4, 2020
c70cb1c
add quote feature (fedibird ver.) (#252)
mashirozx Nov 4, 2020
5e3f482
Merge branch 'master' of https://github.com/tootsuite/mastodon into HEAD
mashirozx Nov 4, 2020
2064106
fix detect-passive-events in dropdown containers
mashirozx Nov 5, 2020
cfbf26f
Merge branch 'rebase' into master-merge-upstream
mashirozx Nov 9, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
quote: fix reblog availability check for local only
mashirozx committed Nov 3, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 19c8d15b6133caad0631ca795a3885cace165a49
3 changes: 2 additions & 1 deletion app/javascript/mastodon/components/status_action_bar.js
Original file line number Diff line number Diff line change
@@ -233,6 +233,7 @@ class StatusActionBar extends ImmutablePureComponent {
const mutingConversation = status.get('muted');
const anonymousAccess = !me;
const publicStatus = ['public', 'unlisted'].includes(status.get('visibility'));
const localOnly = status.get('local_only');
const account = status.get('account');
const federated = !status.get('local_only');

@@ -331,7 +332,7 @@ class StatusActionBar extends ImmutablePureComponent {
<IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} pressed={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} />
<IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />

<IconButton className='status__action-bar-button' disabled={anonymousAccess || !publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} />
<IconButton className='status__action-bar-button' disabled={anonymousAccess || !publicStatus || localOnly} title={anonymousAccess || !publicStatus || localOnly ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} />
{shareButton}

<div className='status__action-bar-dropdown'>
Original file line number Diff line number Diff line change
@@ -193,7 +193,8 @@ class ActionBar extends React.PureComponent {
render () {
const { status, relationship, intl } = this.props;

const publicStatus = ['public', 'unlisted'].includes(status.get('visibility'));
const publicStatus = ['public', 'unlisted'].includes(status.get('visibility'));
const localOnly = status.get('local_only');
const mutingConversation = status.get('muted');
const account = status.get('account');

@@ -282,7 +283,7 @@ class ActionBar extends React.PureComponent {
<div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.reply)} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} /></div>
<div className='detailed-status__button' ><IconButton className={classNames({ reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} /></div>
<div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /></div>
<div className='detailed-status__button'><IconButton disabled={!publicStatus} title={!publicStatus ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} /></div>
<div className='detailed-status__button'><IconButton disabled={!publicStatus || localOnly} title={!publicStatus || localOnly ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.quote)} icon='quote-right' onClick={this.handleQuoteClick} /></div>
{shareButton}
<div className='detailed-status__button'><IconButton className='bookmark-icon' active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} /></div>