mastodon

mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00

History

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

Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream renamed some helper functions that were used in a part of the
  settings page which glitch-soc slightly changed the layout of.
  Ported the change.

2022-02-09 17:28:33 +01:00

about

Change CAPTCHA handling to be only on email verification

2022-01-25 23:56:57 +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-02-09 17:28:33 +01:00

admin_mailer

Remove IP tracking columns from users table (#16409 )

2022-01-16 13:23:50 +01:00

application

Add trending links (#16917 )

2021-11-25 13:07:38 +01:00

auth

Add some explanation text on the CAPTCHA confirmation page

2022-01-26 13:24:51 +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

2021-07-08 16:17:19 +02: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

Improve blocked view of profiles (#10491 )

2019-04-07 04:59:13 +02:00

following_accounts

Improve blocked view of profiles (#10491 )

2019-04-07 04:59:13 +02: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-01-23 18:24:01 +01:00

media

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

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

notification_mailer

Add notifications for statuses deleted by moderators (#17204 )

2022-01-17 09:41:33 +01:00

oauth

Refactor settings controllers (#14767 )

2020-09-11 20:56:35 +02: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-02-09 17:28:33 +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-01-23 18:24:01 +01:00

statuses_cleanup

Add feature to automatically delete old toots (#16529 )

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