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

Merge latest upstream from glitch-soc/mastodon/main #70

Merged
merged 29 commits into from
Jul 3, 2023
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
285a691
Remove the search button from UI header when logged out (#25631)
ClearlyClaire Jun 28, 2023
4581a52
Change account search to match by text when opted-in (#25599)
jsgoldstein Jun 29, 2023
a209d1e
Fix ResolveURLService not resolving local URLs for remote content (#2…
ClearlyClaire Jun 29, 2023
c4a8c33
Remove `pkg-config` gem dependency (#25615)
renchap Jun 30, 2023
8bfbd19
Update Crowdin configuration file
Gargron Jun 30, 2023
9934949
Fix onboarding prompt being displayed because of disconnection gaps (…
ClearlyClaire Jun 30, 2023
78ba12f
Use an Immutable Record as the root state (#25584)
renchap Jun 30, 2023
c47cdf6
Add index to backups on `user_id` column (#25647)
mjankowski Jun 30, 2023
683ba5e
Fix rails `rewhere` deprecation warning in directories api controller…
mjankowski Jul 1, 2023
f8bd581
Remove unused routes (#25578)
mjankowski Jul 1, 2023
155fc45
Fixing an issue with a missing argument (#2261)
viviicat Jul 1, 2023
0139b1c
Update uri to version 0.12.2 (CVE fix) (#25657)
mjankowski Jul 1, 2023
cea9db5
Change local and federated timelines to be in a single firehose colum…
ClearlyClaire Jul 1, 2023
4fe2d7c
Fix HTTP 500 in `/api/v1/emails/check_confirmation` (#25595)
danielmbrasil Jul 1, 2023
50c2a03
Rails 7 update (#24241)
mjankowski Jul 2, 2023
0512537
Change dropdown icon above compose form from ellipsis to bars in web …
Gargron Jul 2, 2023
5b46345
Prevent duplicate concurrent calls of `/api/*/instance` in web UI (#2…
mgmn Jul 2, 2023
ba06a2f
Revert "Rails 7 update" (#25667)
Gargron Jul 2, 2023
44e98a2
Merge branch 'main' into glitch-soc/merge-upstream
ClearlyClaire Jul 2, 2023
b75aa6b
[Glitch] Remove the search button from UI header when logged out
ClearlyClaire Jun 28, 2023
2ba4773
[Glitch] Fix onboarding prompt being displayed because of disconnecti…
ClearlyClaire Jun 30, 2023
eb1cb82
[Glitch] Use an Immutable Record as the root state
renchap Jun 30, 2023
7cc2c1b
[Glitch] Change local and federated timelines to be in a single fireh…
ClearlyClaire Jul 1, 2023
c49e339
[Glitch] Change dropdown icon above compose form from ellipsis to bar…
Gargron Jul 2, 2023
587ddc2
[Glitch] Prevent duplicate concurrent calls of `/api/*/instance` in w…
mgmn Jul 2, 2023
9f3c3f5
Show local-only posts in “All” by default, and add back option to tog…
ClearlyClaire Jul 2, 2023
ed567c9
Merge pull request #2263 from ClearlyClaire/glitch-soc/merge-upstream
ClearlyClaire Jul 2, 2023
b422b5e
Fix showing local only toots in "All" (#2265)
Plastikmensch Jul 3, 2023
ed15893
Add regex filter back to firehose (#2266)
Plastikmensch Jul 3, 2023
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
Change dropdown icon above compose form from ellipsis to bars in web …
Gargron authored Jul 2, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 0512537eb6722f1d52a690a6e1b22c8d0a99103b
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@ class ActionBar extends PureComponent {
return (
<div className='compose__action-bar'>
<div className='compose__action-bar-dropdown'>
<DropdownMenuContainer items={menu} icon='ellipsis-v' size={18} direction='right' />
<DropdownMenuContainer items={menu} icon='bars' size={18} direction='right' />
</div>
</div>
);