mastodon

mirror of https://github.com/mastodon/mastodon.git synced 2025-01-19 00:21:40 +01:00

History

Claire c79a03b319 Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our README.

2022-03-15 20:45:27 +01:00

about

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-08 20:22:54 +01:00

accounts

Merge branch 'main' into glitch-soc/merge-upstream

2021-11-26 22:53:55 +01:00

admin

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-15 20:45:27 +01:00

admin_mailer

Add trending statuses (#17431 )

2022-02-25 00:34:14 +01:00

application

Add trending statuses (#17431 )

2022-02-25 00:34:14 +01:00

auth

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-02 18:02:48 +01:00

authorize_interactions

Fix misleading error when attempting to re-send a pending follow request (#13133 )

2020-02-24 21:19:19 +01:00

directories

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-08 20:22:54 +01:00

disputes/strikes

Change how changes to media attachments are stored for edits (#17696 )

2022-03-09 09:06:17 +01:00

errors

Add specific rate limits for posting and following (#13172 )

2020-03-08 15:17:39 +01:00

filters

Fix not being able to change world filter expiration back to “Never” (#15858 )

2021-03-12 05:25:50 +01:00

follower_accounts

Add /api/v1/accounts/familiar_followers to REST API (#17700 )

2022-03-07 09:36:47 +01:00

following_accounts

Add /api/v1/accounts/familiar_followers to REST API (#17700 )

2022-03-07 09:36:47 +01:00

home

Merge branch 'main' into glitch-soc/merge-upstream

2021-01-21 16:51:12 +01:00

invites

Remove invite comments from UI (#12068 )

2019-10-03 22:37:13 +02:00

kaminari

Pagination improvements (#1445 )

2017-04-11 01:11:41 +02:00

layouts

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-02 18:02:48 +01:00

media

Merge branch 'main' into glitch-soc/merge-upstream

2021-05-07 18:21:59 +02:00

notification_mailer

Change how changes to media attachments are stored for edits (#17696 )

2022-03-09 09:06:17 +01:00

oauth

Change visual separation of applications in authorized apps list (#17686 )

2022-03-02 20:28:25 +01:00

public_timelines

Merge branch 'main' into glitch-soc/merge-upstream

2021-01-21 16:51:12 +01:00

relationships

Merge branch 'main' into glitch-soc/merge-upstream

2021-07-08 16:17:19 +02:00

remote_follow

Admission-based registrations mode (#10250 )

2019-03-14 05:28:30 +01:00

remote_interaction

Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247 )

2019-07-07 16:16:51 +02:00

settings

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-08 20:22:54 +01:00

shared

Add honeypot fields and minimum fill-out time for sign-up form (#15276 )

2020-12-10 06:27:26 +01:00

Add subresource integrity for JS and CSS assets (#15096 )

2020-11-06 11:56:31 +01:00

statuses

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-15 20:45:27 +01:00

statuses_cleanup

Add feature to automatically delete old toots (#16529 )

2021-08-09 23:11:50 +02:00