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.
2022-07-17 22:07:20 +02:00
..
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-15 10:20:58 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-15 10:20:58 +09:00
2022-07-15 10:20:58 +09:00
2022-07-15 10:20:58 +09:00
2022-07-07 05:58:31 +09:00
2022-07-15 10:20:58 +09:00
2022-07-07 05:58:31 +09:00
2022-07-15 10:20:58 +09:00
2022-07-15 10:20:58 +09:00
2022-07-07 05:58:31 +09:00
2022-07-15 10:20:58 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-15 10:20:58 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-15 10:20:58 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-15 10:20:58 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2017-11-20 22:13:37 -08:00
2022-07-15 10:20:58 +09:00
2022-07-15 10:20:58 +09:00
2022-07-15 10:20:58 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-15 10:20:58 +09:00
2022-07-15 10:20:58 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-15 10:20:58 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-15 10:20:58 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-15 10:20:58 +09:00
2022-07-07 05:58:31 +09:00
2022-07-15 10:20:58 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-15 10:20:58 +09:00
2022-07-07 05:58:31 +09:00
2022-07-15 10:20:58 +09:00
2022-07-15 10:20:58 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-15 10:20:58 +09:00
2022-07-15 10:20:58 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-15 10:20:58 +09:00
2022-07-07 05:58:31 +09:00
2022-07-15 10:20:58 +09:00
2021-04-22 00:04:58 +02:00
2018-05-03 15:54:10 +02:00
2018-05-03 15:54:10 +02:00
2022-06-04 13:44:49 +09:00
2021-04-22 00:04:58 +02:00
2017-12-09 15:35:22 +01:00
2019-04-21 04:52:20 +02:00
2018-01-22 14:20:58 +01:00
2020-07-10 20:57:21 +02:00
2021-04-22 00:04:58 +02:00
2021-04-22 00:04:58 +02:00
2020-11-09 00:56:52 +01:00
2021-04-22 00:04:58 +02:00
2018-05-03 15:54:10 +02:00
2017-06-05 17:02:41 +02:00
2020-12-16 03:24:55 +01:00
2020-07-10 20:57:21 +02:00
2017-05-30 23:09:02 +02:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-07 05:58:31 +09:00
2022-07-15 10:20:58 +09:00