This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js		2018-09-19 21:46:01 +02:00
..
activitypub	Do not check for file existence when serializing ActivityPub actor (#8386)	2018-08-23 16:39:22 +02:00
rest	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
rss	Add RSS feeds for end-users (#7259)	2018-04-25 02:10:02 +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	Let the front-end know the current account is a moderator	2018-09-03 18:19:11 +02:00
manifest_serializer.rb	implement web share target (#6278)	2018-01-17 17:08:10 +01:00
oembed_serializer.rb	Clean up and improve generated OpenGraph tags (#4901)	2017-09-12 05:39:38 +02:00
webfinger_serializer.rb	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00