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

..

activitypub

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

2022-01-19 23:52:48 +01:00

nodeinfo

Add openRegistrations attribute to nodeinfo endpoint (#12058)

2019-10-02 21:02:48 +02:00

rest

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

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

rss

Improve RSS entries for statuses (#13592)

2020-05-10 09:50:54 +02:00

web

Only display web push notifications after API call (fixes #7902) (#8396)

2018-08-23 21:44:27 +02:00

initial_state_serializer.rb

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

2021-06-30 00:42:52 +02:00

manifest_serializer.rb

use relative path for scope (#16714)

2021-09-08 23:33:36 +02:00

oembed_serializer.rb

Improve RSS entries for statuses (#13592)

2020-05-10 09:50:54 +02:00

webfinger_serializer.rb

Remove XML version of Webfinger and remove links to Atom feeds (#11460)

2019-08-01 19:14:02 +02:00