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.

Sign up for GitHub

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

Jump to bottom

Merge upstream changes #2263

Merged
merged 25 commits into from
Jul 2, 2023
Merged

Merge upstream changes #2263

merged 25 commits into from
Jul 2, 2023

Conversation

ClearlyClaire
Copy link

@ClearlyClaire ClearlyClaire commented Jul 2, 2023 •
edited
Loading

Conflicts

None

Ported changes

Additional changes

ClearlyClaire and others added 24 commits June 28, 2023 14:57
@ClearlyClaire
Remove the search button from UI header when logged out (mastodon#25631)
285a691
@jsgoldstein @Gargron
Change account search to match by text when opted-in (mastodon#25599)
4581a52 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
@ClearlyClaire
Fix ResolveURLService not resolving local URLs for remote content (ma…
a209d1e 
…stodon#25637)
@renchap
Remove pkg-config gem dependency (mastodon#25615)
c4a8c33
@Gargron
Update Crowdin configuration file
8bfbd19
@ClearlyClaire
Fix onboarding prompt being displayed because of disconnection gaps (m…
9934949 
…astodon#25617)
@renchap
Use an Immutable Record as the root state (mastodon#25584)
78ba12f
@mjankowski
Add index to backups on user_id column (mastodon#25647)
c47cdf6
@mjankowski
Fix rails rewhere deprecation warning in directories api controller (…
683ba5e 
…mastodon#25625)
@mjankowski
Remove unused routes (mastodon#25578)
f8bd581
@mjankowski
Update uri to version 0.12.2 (CVE fix) (mastodon#25657)
0139b1c
@ClearlyClaire
Change local and federated timelines to be in a single firehose column (
cea9db5 
mastodon#25641)
@danielmbrasil
Fix HTTP 500 in /api/v1/emails/check_confirmation (mastodon#25595)
4fe2d7c
@mjankowski
Rails 7 update (mastodon#24241)
50c2a03
@Gargron
Change dropdown icon above compose form from ellipsis to bars in web …
0512537 
…UI (mastodon#25661)
@mgmn
Prevent duplicate concurrent calls of /api/*/instance in web UI (ma…
5b46345 
…stodon#25663)
@Gargron
Revert "Rails 7 update" (mastodon#25667)
ba06a2f
@ClearlyClaire
Merge branch 'main' into glitch-soc/merge-upstream
44e98a2
@ClearlyClaire
[Glitch] Remove the search button from UI header when logged out
b75aa6b 
Port 285a691 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
[Glitch] Fix onboarding prompt being displayed because of disconnecti…
2ba4773 
…on gaps

Port 9934949 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@renchap @ClearlyClaire
[Glitch] Use an Immutable Record as the root state
eb1cb82 
Port 78ba12f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
[Glitch] Change local and federated timelines to be in a single fireh…
7cc2c1b 
…ose column

Port cea9db5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@Gargron @ClearlyClaire
[Glitch] Change dropdown icon above compose form from ellipsis to bar…
c49e339 
…s in web UI

Port 0512537 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@mgmn @ClearlyClaire
[Glitch] Prevent duplicate concurrent calls of /api/*/instance in w…
587ddc2 
…eb UI

Port 5b46345 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire ClearlyClaire marked this pull request as ready for review July 2, 2023 10:34
@Plastikmensch
Copy link

The new column doesn't show local-only toots under "All".
I think it should.

@ClearlyClaire
Copy link
Author

Ah, I knew I was missing something. The current column does not show local-only posts, but that can be configured.

We could bring back the configuration option for this column, but it would be rather awkward having it apply to all three tabs…

Maybe simply have it labelled “Allow local-only posts in All tab” but eh

@Plastikmensch
Copy link

Ah, I knew I was missing something. The current column does not show local-only posts, but that can be configured.

We could bring back the configuration option for this column, but it would be rather awkward having it apply to all three tabs…

Maybe simply have it labelled “Allow local-only posts in All tab” but eh

It does show them under "Local", but yeah I think bringing that option back isn't a good idea.
And the name "All" does imply it shows everything, so I'm for just showing them.
Otherwise I think the chance of people completely missing local-only toots is quite high.

@ClearlyClaire
Copy link
Author

We initially excluded them from “Federated” (which is replaced by “All”) because people were confused that they were showing up there, so… makes sense to me this would be configurable… maybe the setting should only show up when the “All” tab is selected, but that is awkward as well

@Plastikmensch
Copy link

We initially excluded them from “Federated” (which is replaced by “All”) because people were confused that they were showing up there, so… makes sense to me this would be configurable… maybe the setting should only show up when the “All” tab is selected, but that is awkward as well

Sorry, didn't get a notification for your reply for some reason.

True, but I think "Federated" and "All" have different meanings.
I'm usually against removing functionality, but I think it would make sense here, though only showing it when "All" is selected does make sense, but as you said it's awkward.

@ClearlyClaire
Copy link
Author

Ended up adding it as a (default-on) toggle:
image

@ClearlyClaire ClearlyClaire force-pushed the glitch-soc/merge-upstream branch from e905499 to 9f3c3f5 Compare July 2, 2023 18:28
@ClearlyClaire ClearlyClaire merged commit ed567c9 into glitch-soc:main Jul 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@ClearlyClaire @Plastikmensch @jsgoldstein @renchap @Gargron @mjankowski @danielmbrasil @mgmn