aiden
/
mastodon
mirror of https://github.com/mastodon/mastodon
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
i18n/crowdin/translations
renovate/aws-sdk-core-3.x-lockfile
renovate/haml_lint-0.x-lockfile
backports/4.3
backports/4.4
main
backports/4.5
feat/profile-display-name
tests/ditch-inline-script
stable-4.2
stable-4.1
stable-4.0
stable-3.5
stable-3.4
stable-3.3
stable-3.2
renovate/major-formatjs-monorepo
renovate/csstools-stylelint-formatter-github-2.x
renovate/postcss-preset-env-11.x-lockfile
feat/collections-collection
renovate/stylelint-config-standard-scss-17.x
renovate/ioredis-5.x-lockfile
renovate/stylelint-17.x
stable-4.5
stable-4.4
stable-4.3
feat/profile-v2-feed
renovate/vite-tsconfig-paths-6.x-lockfile
renovate/docker.io-ruby-4.x
renovate/ruby-4.x
emoji/docs
renovate/storybook-(non-major)
experiment/emoji-picker
investigate-perf-issues/sidekiq-unique-jobs
fixes/wrapstodon-disable-if-automated-deletion
renovate/eslint-plugin-jsdoc-62.x
renovate/ruby-on-rails-packages
renovate/devise-two-factor-6.x-lockfile
renovate/major-emojibase-monorepo
renovate/dotenv-17.x
renovate/reduxjs-toolkit-2.x-lockfile
fix-account-search-ordering
test-with-ruby-4.0
renovate/connection_pool-3.x-lockfile
renovate/net-http-0.x
remove/trendable-provider-attribution
fixes/store-key-id
dion/remember-revealed-archetype
i18n/crowdin/translations-stable-4.4
fixes/media-batch-s3
dion/implement-css-theme-tokens
features/add-privacy-presets-in-composer
fix/announcements-delay
new-coc
dion/implement-css-theme-tokens-as-theme
dion/add-fetch-all-alert-placeholder
fixes/rename-feed-setting-values
fixes/allow-quote-empty-text
renovate/eslint-plugin-jsdoc-60.x
feat/donation-modal
feature-link-rel-nopreview
revert-context
feat/thunk-conditional-dispatch
refactor/tanstack-router
fixes/httplog-debug
features/extend-quote-edit-notification
refactor/combine-action-bars
backports/4.4-reserved-usernames
refactor/compose-state
dion/fix-duplicated-scroll-context-logic
feature-preview-fep-b2b8
fixes/cancel-follow-request
feature-thread-pagination
fixes/pending-hashtags-count
hacks/mailer-cutoff
features/ruby-vite-name-lookup
feature-avatar-color-extraction
feature-starter-packs
investigations/e2e-failures
dion/add-mutual-info-to-hover-card
feature-quotes-web
fix-accidental-new-tab-on-scroll
debug/ghost-followers-synchronization
feature-streaming-profile
fixes/account-note
fixes/recheck-suspensions
feat/fasp_trends
updates/vips
features/split-in-app-notif
refactor/modal-stack
tests/media-description-modal
fixes/out-of-order-private-posts
fixes/thread-resolve-worker-skip_fetching
replace-oj-with-json
refactor-status-content-typescript
fixes/embed-requestAnimationFrame
features/lock-icon-on-hover-card
feature-admin-report-forward
feature-reports-batch-actions
fix-admin-dashboard-slow
fix-future-date-trend
redesign/content-warning-filters-4.3
fixes/filtered-follows
activitypub/summary-over-name
build-stable-nightly
fixes/notification-excerpt-paragraph
fixes/mastodon-setup-task-redis
fixes/regexp-timeout-optional
fixes/small-otp-secret-length-4.1
fixes/small-otp-secret-length-4.2
fixes/dashboard-quick-access-overflow
fixes/middle-column-size
fix-context-socialweb-miscellany
fixes/detect-missing-indexes2
cleanup/simplify-css
feature-post-layout
features/media-description-in-embedded-status
design/notifications-grid
fix-lookup-domain
flaky-conversations-test
fixes/crash-orphaned-notification
fixes/report-links
features/filtered-dismiss-accept-all
feat/clean-up-notifications
fixes/everyone-role-n+1
redesign/notification-request
experimental/notification-groups-api-shape
spike/resolve-urls-on-click
cleanup/drop-atomuri
fixes/dismissing-notification-requests-dismisses-too-much
revert-system-check
feature-redirect
fix-unusable-hashtag
tests/flaky-tests-performance-logs
feature-grouped-notifications-ui
fix-mute-buttons
features/local-preview-cards-2nd-take
fix-conversations-background
revert-severed-relationships-feature
features/local-preview-cards
releases/v3.5.17
releases/v4.1.13
releases/v4.2.5
version/v4.3.0-alpha.1
fix/build-env
feature-color-scheme
revert/follow-back-mutual
gh-readonly-queue/main/pr-28626-1ad908e0c08c236389967d86b4f238f428de9fef
fixes/per-user-authorized-fetch
fixes/import-many-follows-overlap
fix-web-thread-sort
test-new-container-build
fixes/24px-icons
features/registration-invite-api
fixes/service-worker-caching
fixes/account-refresh-link-verification
feature-like
tests/introduce-error
fixes/lint-fix
fixes/object-has-own-polyfill
fixes/audio-passthrough
fixes/audit-log-external-confirmation
features/banners
refactor/search-query-parser
remove-profile-directory
redesign/notification-settings
feature-separate-hashtags
fixes/self-destruct-throttle
fixes/subdomain-block-4.1.6
redesign/hashtag-column-follow-button
feature-trend-highlights
revert-23460-fixes/activitypub-hashtag
pg15
prevent-unauthenticated-access-tag-timeline
support-rich-oembed
fix-caniuselite-lockfile
track_unsalvageable_errors
add-publish-button-text-site-setting
nolan/button-a11y
i18n/manage-translations
deps/shakapacker
rubocop-fixes
react18
stable-3.1
stable-3.0
stable-2.9
stable-2.8
stable-2.7
stable-2.5
stable-2.6
stable-2.4
v0.1.2
v0.1.1
v0.1.0
v0.6
v0.7
v0.8
v0.9
v0.9.9
v1.0
v1.1
v1.1.1
v1.1.2
v1.2
v1.2.1
v1.2.2
v1.3
v1.3.1
v1.3.2
v1.3.3
v1.4.1
v1.4.2
v1.4.3
v1.4.4
v1.4.5
v1.4.6
v1.4.7
v1.4rc1
v1.4rc2
v1.4rc3
v1.4rc4
v1.4rc5
v1.4rc6
v1.5.0
v1.5.0rc1
v1.5.0rc2
v1.5.0rc3
v1.5.1
v1.6.0
v1.6.0rc1
v1.6.0rc2
v1.6.0rc3
v1.6.0rc4
v1.6.0rc5
v1.6.1
v2.0.0
v2.0.0rc1
v2.0.0rc2
v2.0.0rc3
v2.0.0rc4
v2.1.0
v2.1.0rc1
v2.1.0rc2
v2.1.0rc3
v2.1.0rc4
v2.1.0rc5
v2.1.0rc6
v2.1.1
v2.1.2
v2.1.3
v2.2.0
v2.2.0rc1
v2.2.0rc2
v2.3.0
v2.3.0rc1
v2.3.0rc2
v2.3.0rc3
v2.3.1
v2.3.1rc1
v2.3.1rc2
v2.3.1rc3
v2.3.2
v2.3.2rc1
v2.3.2rc2
v2.3.2rc3
v2.3.2rc4
v2.3.2rc5
v2.3.3
v2.4.0
v2.4.0rc1
v2.4.0rc2
v2.4.0rc3
v2.4.0rc4
v2.4.0rc5
v2.4.1
v2.4.1rc1
v2.4.1rc2
v2.4.1rc3
v2.4.1rc4
v2.4.2
v2.4.2rc1
v2.4.2rc2
v2.4.2rc3
v2.4.3
v2.4.3rc1
v2.4.3rc2
v2.4.3rc3
v2.4.4
v2.4.5
v2.5.0
v2.5.0rc1
v2.5.0rc2
v2.5.1
v2.5.2
v2.6.0
v2.6.0rc1
v2.6.0rc2
v2.6.0rc3
v2.6.0rc4
v2.6.1
v2.6.2
v2.6.3
v2.6.4
v2.6.5
v2.7.0
v2.7.0rc1
v2.7.0rc2
v2.7.0rc3
v2.7.1
v2.7.2
v2.7.3
v2.7.4
v2.8.0
v2.8.0rc1
v2.8.0rc2
v2.8.0rc3
v2.8.1
v2.8.2
v2.8.3
v2.8.4
v2.9.0
v2.9.0rc1
v2.9.0rc2
v2.9.1
v2.9.2
v2.9.3
v2.9.4
v3.0.0
v3.0.0rc1
v3.0.0rc2
v3.0.0rc3
v3.0.1
v3.0.2
v3.1.0
v3.1.0rc1
v3.1.0rc2
v3.1.1
v3.1.2
v3.1.3
v3.1.4
v3.1.5
v3.2.0
v3.2.0rc1
v3.2.0rc2
v3.2.1
v3.2.2
v3.3.0
v3.3.0rc1
v3.3.0rc2
v3.3.0rc3
v3.3.1
v3.3.2
v3.3.3
v3.4.0
v3.4.0rc1
v3.4.0rc2
v3.4.1
v3.4.10
v3.4.2
v3.4.3
v3.4.4
v3.4.5
v3.4.6
v3.4.7
v3.4.8
v3.4.9
v3.5.0
v3.5.0rc1
v3.5.0rc2
v3.5.0rc3
v3.5.1
v3.5.10
v3.5.11
v3.5.12
v3.5.13
v3.5.14
v3.5.15
v3.5.16
v3.5.17
v3.5.18
v3.5.19
v3.5.2
v3.5.3
v3.5.4
v3.5.5
v3.5.6
v3.5.7
v3.5.8
v3.5.9
v4.0.0
v4.0.0rc1
v4.0.0rc2
v4.0.0rc3
v4.0.0rc4
v4.0.1
v4.0.10
v4.0.11
v4.0.12
v4.0.13
v4.0.14
v4.0.15
v4.0.2
v4.0.3
v4.0.4
v4.0.5
v4.0.6
v4.0.7
v4.0.8
v4.0.9
v4.1.0
v4.1.0rc1
v4.1.0rc2
v4.1.0rc3
v4.1.1
v4.1.10
v4.1.11
v4.1.12
v4.1.13
v4.1.14
v4.1.15
v4.1.16
v4.1.17
v4.1.18
v4.1.19
v4.1.2
v4.1.20
v4.1.21
v4.1.22
v4.1.23
v4.1.24
v4.1.25
v4.1.3
v4.1.4
v4.1.5
v4.1.6
v4.1.7
v4.1.8
v4.1.9
v4.2.0
v4.2.0-beta1
v4.2.0-beta2
v4.2.0-beta3
v4.2.0-rc1
v4.2.0-rc2
v4.2.1
v4.2.10
v4.2.11
v4.2.12
v4.2.13
v4.2.14
v4.2.15
v4.2.16
v4.2.17
v4.2.18
v4.2.19
v4.2.2
v4.2.20
v4.2.21
v4.2.22
v4.2.23
v4.2.24
v4.2.25
v4.2.26
v4.2.27
v4.2.28
v4.2.29
v4.2.3
v4.2.4
v4.2.5
v4.2.6
v4.2.7
v4.2.8
v4.2.9
v4.3.0
v4.3.0-beta.1
v4.3.0-beta.2
v4.3.0-rc.1
v4.3.1
v4.3.10
v4.3.11
v4.3.12
v4.3.13
v4.3.14
v4.3.15
v4.3.16
v4.3.17
v4.3.2
v4.3.3
v4.3.4
v4.3.5
v4.3.6
v4.3.7
v4.3.8
v4.3.9
v4.4.0
v4.4.0-beta.1
v4.4.0-beta.2
v4.4.0-rc.1
v4.4.1
v4.4.10
v4.4.11
v4.4.2
v4.4.3
v4.4.4
v4.4.5
v4.4.6
v4.4.7
v4.4.8
v4.4.9
v4.5.0
v4.5.0-beta.1
v4.5.0-beta.2
v4.5.0-rc.1
v4.5.0-rc.2
v4.5.0-rc.3
v4.5.1
v4.5.2
v4.5.3
v4.5.4
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'a3dd2deda3'
${ noResults }
mastodon/app/controllers
History
Thibaut Girka c1c514ca70 Merge branch 'master' into glitch-soc/merge-upstream 
Manually-resolved conflicts:
	.circleci/config.yml
	app/controllers/accounts_controller.rb
	app/controllers/auth/passwords_controller.rb
	app/controllers/statuses_controller.rb
	app/javascript/packs/public.js
	app/models/media_attachment.rb
	app/views/stream_entries/_content_spoiler.html.haml
	app/views/stream_entries/_media.html.haml
	config/locales/en.yml
	config/locales/ja.yml
	config/locales/pl.yml
	lib/mastodon/version.rb

Some content from app/javascript/packs/public.js has been split to
app/javascript/core/settings.js.

Translation strings for glitch-soc's keyword mutes were dropped.

Everything else was mostly “take both”.
 		8 years ago
..
activitypub Better pagination for ActivityPub outbox (#7356) 8 years ago
admin Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
api Merge branch 'master' into glitch-soc/tentative-merge 8 years ago
auth Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
concerns Redesign public profiles and toots (#8068) 8 years ago
oauth Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
settings Migrate glitch-soc keyword mutes to Mastodon's 8 years ago
well_known Make host_meta/webfinger replies cacheable (fixes #6100) (#6101) 8 years ago
about_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
account_follow_controller.rb
…
account_unfollow_controller.rb
…
accounts_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
application_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
authorize_follows_controller.rb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 8 years ago
emojis_controller.rb Cache JSON of immutable ActivityPub representations (#6171) 8 years ago
filters_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
follower_accounts_controller.rb Merge remote-tracking branch 'origin/master' into merge-upstream 8 years ago
following_accounts_controller.rb Merge remote-tracking branch 'origin/master' into merge-upstream 8 years ago
home_controller.rb Merge remote-tracking branch 'origin/master' into gs-master 8 years ago
intents_controller.rb Add tests for intents_controller (#7763) 8 years ago
invites_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
manifests_controller.rb
…
media_controller.rb Save video metadata and improve video OpenGraph tags (#6481) 8 years ago
media_proxy_controller.rb Raise Mastodon::RaceConditionError if Redis lock failed (#7511) 8 years ago
remote_follow_controller.rb Merge branch 'master' into glitch-soc/tentative-merge 8 years ago
remote_unfollows_controller.rb Add tests for remote_unfollows_controller (#7879) 8 years ago
shares_controller.rb Merge branch 'master' into glitch-soc/merge 8 years ago
statuses_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
stream_entries_controller.rb Merge remote-tracking branch 'origin/master' into gs-master 8 years ago
tags_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 8 years ago