Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

mastodon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

cea9db5a

Unverified Commit cea9db5a authored 1 year ago by Claire Committed by GitHub 1 year ago

Downloads
- Patches
- Plain Diff

Change local and federated timelines to be in a single firehose column (#25641)

parent 0139b1c8

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/javascript/mastodon/features/firehose/index.jsx 210 additions, 0 deletions

app/javascript/mastodon/features/firehose/index.jsx
app/javascript/mastodon/features/ui/components/navigation_panel.jsx 6 additions, 6 deletions

...ript/mastodon/features/ui/components/navigation_panel.jsx
app/javascript/mastodon/features/ui/index.jsx 6 additions, 4 deletions

app/javascript/mastodon/features/ui/index.jsx
app/javascript/mastodon/features/ui/util/async-components.js 4 additions, 0 deletions

app/javascript/mastodon/features/ui/util/async-components.js
app/javascript/mastodon/locales/en.json 4 additions, 2 deletions

app/javascript/mastodon/locales/en.json
app/javascript/mastodon/reducers/settings.js 4 additions, 0 deletions

app/javascript/mastodon/reducers/settings.js

with 234 additions and 12 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment