You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire cd87d7dcef Merge branch 'main' into glitch-soc/merge-upstream ... - `.env.production.sample`: Our sample config file is very different from upstream since it is much more complete. Upstream added documentation for a few env variables. Copied the new variables/documentation from upstream. - `app/lib/feed_manager.rb`: Upstream added a timeline type (hashtags), while glitch-soc already had an extra one (direct messages). Not really a conflict but textually close changes. Ported upstream's changes. - `app/models/custom_emoji.rb`: Upstream upped the custom emoji size limit, while glitch-soc had configurable limits. Upped the default limits accordingly. - `streaming/index.js`: Upstream reworked how hastags were normalized. Minor conflict due to glitch-soc's handling of instance-local posts. Ported upstream's changes.		2 years ago
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
nodeinfo	Add “services” and “metadata” to NodeInfo (#18563)	2 years ago
rest	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
web	Fix web push notifications containing HTML entities (#18071)	3 years ago
initial_state_serializer.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
manifest_serializer.rb	Change brand color and logotypes (#18592)	2 years ago
oembed_serializer.rb	Improve RSS entries for statuses (#13592)	5 years ago
webfinger_serializer.rb	Remove XML version of Webfinger and remove links to Atom feeds (#11460)	5 years ago