Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb

2019-09-30 12:23:57 +02:00

..

activitypub

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

2019-09-30 12:23:57 +02:00

nodeinfo

Add a nodeinfo endpoint (#12002)

2019-09-29 21:31:51 +02:00

rest

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

2019-09-30 12:23:57 +02:00

rss

fix rss enclosure length (#11889)

2019-09-19 13:24:50 +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 'master' into glitch-soc/merge-upstream

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

manifest_serializer.rb

Add method and enctype to manifest (#11767)

2019-09-05 15:51:51 +02:00

oembed_serializer.rb

Add allowfullscreen attribute to oembed iframe (#10370)

2019-03-25 15:01:09 +01:00

webfinger_serializer.rb

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

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