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-03-17 19:23:39 +01: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-17 22:07:20 +02:00
2022-07-15 10:20:58 +09:00
2022-07-07 05:58:31 +09:00
2022-07-17 22:07:20 +02: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
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-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-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-17 22:07:20 +02: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
2019-09-16 15:11:01 +02:00
2022-03-17 09:33:25 +09:00
2022-05-06 21:53:22 +09:00
2019-09-29 17:10:01 +02:00
2021-05-08 17:12:56 +02:00
2019-08-17 22:02:37 +02:00
2022-06-04 13:44:49 +09:00
2019-09-20 23:05:23 +02:00
2021-04-22 00:04:58 +02:00
2020-01-12 15:18:03 +01:00
2020-01-12 15:18:03 +01:00
2019-11-13 23:24:55 +01:00
2020-07-10 20:57:21 +02:00
2021-04-22 00:04:58 +02:00
2019-10-03 03:36:52 +02:00
2019-11-13 23:24:55 +01:00
2019-11-13 23:24:55 +01:00
2019-09-16 15:11:01 +02:00
2021-04-22 00:04:58 +02:00
2019-09-16 15:11:01 +02:00
2020-11-09 00:56:52 +01:00
2020-05-13 22:35:20 +02:00
2021-04-22 00:04:58 +02:00
2020-07-02 00:45:15 +02:00
2020-07-02 00:45:15 +02:00
2020-12-16 03:24:55 +01:00
2020-07-10 20:57:21 +02:00
2019-11-13 23:24:55 +01:00
2020-01-12 15:18:03 +01:00
2020-11-09 00:56:52 +01: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
cd87d7dcef