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

..

activitypub

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

2022-10-02 18:46:22 +02:00

admin

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

2023-01-18 17:38:11 +01:00

api

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

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

auth

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

2022-12-15 20:25:25 +01:00

concerns

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

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

disputes

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

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

filters

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

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

oauth

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

2022-11-17 21:56:05 +01:00

settings

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

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

well_known

Remove Keybase integration (#17045)

2021-11-26 05:58:18 +01:00

about_controller.rb

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

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

accounts_controller.rb

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

2022-11-17 12:01:37 +01:00

application_controller.rb

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

2022-07-05 09:33:44 +02:00

authorize_interactions_controller.rb

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

2022-05-01 16:52:27 +02:00

custom_css_controller.rb

Add customizable user roles (#18641)

2022-07-05 02:41:40 +02:00

emojis_controller.rb

Add (back) rails-level JSON caching (#11333)

2019-07-21 22:32:16 +02:00

filters_controller.rb

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

2022-08-25 05:07:39 +02:00

follower_accounts_controller.rb

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

2022-12-15 20:25:25 +01:00

following_accounts_controller.rb

Fix single name variables on controller folder (#20092)

2022-12-15 17:11:58 +01:00

health_controller.rb

Change health check (#15988)

2021-04-03 02:39:04 +02:00

home_controller.rb

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

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

instance_actors_controller.rb

Fix instance actor not being dereferenceable (#17457)

2022-02-06 15:31:03 +01:00

intents_controller.rb

Refactor controllers for statuses, accounts, and more (#11249)

2019-07-08 12:03:45 +02:00

invites_controller.rb

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

2019-08-19 21:49:35 +02:00

manifests_controller.rb

Fix redirecting non-functional accounts on public pages (#11978)

2019-09-28 01:33:27 +02:00

media_controller.rb

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

2022-12-15 20:25:25 +01:00

media_proxy_controller.rb

Refactor how Redis locks are created (#18400)

2022-05-13 00:02:35 +02:00

privacy_controller.rb

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

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

relationships_controller.rb

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

2020-11-12 22:13:57 +01:00

shares_controller.rb

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

2019-08-19 21:49:35 +02:00

statuses_cleanup_controller.rb

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

2022-11-17 12:01:37 +01:00

statuses_controller.rb

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

2022-12-15 20:25:25 +01:00

tags_controller.rb

Remove posts count and last posts from ActivityPub representation of hashtag collections (#23460)

2023-02-08 17:57:25 +01:00