Claire 85558a5e18 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`:
  Minor upstream change, our README is completely different.
  Kept ours.
- `lib/tasks/assets.rake`:
  glitch-soc has extra code to deal with its theming system,
  upstream changed a line that exists in glitch-soc.
  Applied upstream changes.

2023-02-09 12:46:12 +01:00

..

about

Change public accounts pages to mount the web UI (#19319)

2022-10-20 14:35:29 +02:00

accounts

Fix being able to spoof link verification (#20217)

2022-11-09 08:24:21 +01:00

admin

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

2023-02-09 12:46:12 +01:00

admin_mailer

Add support for language preferences for trending statuses and links (#18288)

2022-10-08 16:45:40 +02:00

application

Fix style for hashes (#20518)

2022-11-17 11:05:39 +01:00

auth

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

2023-01-24 20:32:31 +01:00

authorize_interactions

Fix links to the Web UI in notifications (#19981)

2022-11-07 15:42:58 +01:00

custom_css

Fix badge color not affected (#18826)

2022-07-19 01:06:11 +02:00

disputes/strikes

Fix incorrectly formatted datetime in account moderation note timestamp (#22555)

2023-01-05 13:35:28 +01:00

errors

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

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

filters

Fix error when accessing /filters/:id/statuses on glitch-soc (#1837)

2022-08-31 11:55:27 +02:00

follower_accounts

Change public accounts pages to mount the web UI (#19319)

2022-10-20 14:35:29 +02:00

following_accounts

Change public accounts pages to mount the web UI (#19319)

2022-10-20 14:35:29 +02:00

home

Change public accounts pages to mount the web UI (#19319)

2022-10-20 14:35:29 +02: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

2023-01-14 22:34:09 +01:00

media

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

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

notification_mailer

Fix links to the Web UI in notifications (#19981)

2022-11-07 15:42:58 +01:00

oauth

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

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

privacy

Change public accounts pages to mount the web UI (#19319)

2022-10-20 14:35:29 +02:00

relationships

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

2023-01-14 22:34:09 +01:00

settings

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

2023-01-25 17:26:38 +01:00

shared

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

2022-10-28 19:23:58 +02:00

shares

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

2023-02-03 19:23:27 +01:00

statuses_cleanup

Add feature to automatically delete old toots (#16529)

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

tags

Change public accounts pages to mount the web UI (#19319)

2022-10-20 14:35:29 +02:00

user_mailer

Remove unnecessary sections from welcome e-mail (#19299)

2022-10-06 00:03:52 +02:00

well_known/host_meta

Remove dependency on goldfinger gem (#14919)

2020-10-08 00:34:57 +02:00