Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-25 20:06:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
cb1d1e289e93e1da761586f20330ee1d8ce08044
mastodon/app/views
History
Claire 303a5478af Merge commit 'dfbf908870fcde76396ebccfb3d71ee1a06ffe82' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/wrapstodon/show.html.haml`:
  Conflict because of glitch-soc's theming system.
  Applied upstream's changes.
2025-12-11 19:05:32 +01:00
..
about
…
accounts
Fix Accept headers when fetching AP objects to match spec (#30354)
2025-11-05 13:32:29 +00:00
admin
Merge commit 'b3b5bf26d14f809a562244642949826b6a91bade' into glitch-soc/merge-upstream
2025-12-04 20:16:21 +01:00
admin_mailer
…
application
Merge commit '02de05dc272856c77fac5c9e1d84cf585ae20c1e' into glitch-soc/merge-upstream
2025-08-27 18:13:03 +02:00
auth
Merge commit '284b46fee7ad682b52c99d0455a1134e1d4e3fc3' into glitch-soc/merge-upstream
2025-11-19 21:34:53 +01:00
custom_css
…
disputes/strikes
…
errors
…
filters
Fix unfortunate action button wrapping in admin area (#36247)
2025-09-24 08:57:18 +00:00
follower_accounts
…
following_accounts
…
home
…
invites
Fix missing button styles on some forms (#33771)
2025-01-29 10:36:24 +00:00
kaminari
…
layouts
Merge commit '65b216353e9bc9ae8517d967f8c2cd8122551fdc' into glitch-soc/merge-upstream
2025-12-05 19:25:40 +01:00
mail_subscriptions
Fix missing button styles on some forms (#33771)
2025-01-29 10:36:24 +00:00
media
Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream
2025-05-25 14:36:51 +02:00
notification_mailer
Fix moderation warning e-mails that include posts (#36462)
2025-10-14 11:48:51 +00:00
oauth
Fix unfortunate action button wrapping in admin area (#36247)
2025-09-24 08:57:18 +00:00
privacy
…
redirects
…
relationships
Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream
2025-05-25 14:36:51 +02:00
remote_interaction_helper
Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream
2025-05-25 14:36:51 +02:00
settings
Merge commit '284b46fee7ad682b52c99d0455a1134e1d4e3fc3' into glitch-soc/merge-upstream
2025-11-19 21:34:53 +01:00
severed_relationships
Fix layout of severed relationships when purged events are listed (#36593)
2025-10-27 15:19:38 +00:00
shared
Merge commit '54ad57ea9527a58ac2b95159ed178ed7c737a89c' into glitch-soc/merge-upstream
2025-05-30 17:41:31 +02:00
shares
Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream
2025-05-25 14:36:51 +02:00
statuses
Remove unneeded type check on Status in og_image partial (#36980)
2025-11-21 14:29:03 +00:00
statuses_cleanup
…
tags
Fix Accept headers when fetching AP objects to match spec (#30354)
2025-11-05 13:32:29 +00:00
terms_of_service
…
terms_of_service_interstitial
Add interstitial for Terms of Service updates (#34527)
2025-05-16 14:03:05 +00:00
user_mailer
Remove unused local vars from user mailer warning (#35977)
2025-09-02 07:35:53 +00:00
well_known/host_meta
…
wrapstodon
Merge commit 'dfbf908870fcde76396ebccfb3d71ee1a06ffe82' into glitch-soc/merge-upstream
2025-12-11 19:05:32 +01:00