Jeremy Kescher 004b22602b Merge branch 'emoji-reactions-base' into develop ... # Conflicts: # app/javascript/flavours/glitch/components/status.jsx # app/javascript/flavours/glitch/locales/en.json # app/javascript/flavours/glitch/styles/components.scss		2024-02-24 11:08:13 +01:00
..
chewy	Clamp dates when serializing to Elasticsearch API (#28081)	2023-11-27 13:25:54 +00:00
controllers	Merge branch 'glitch-soc' into develop	2024-02-16 14:48:08 +01:00
helpers	Merge pull request from GHSA-jhrq-qvrm-qr36	2024-02-16 12:17:15 +01:00
javascript	Merge branch 'emoji-reactions-base' into develop	2024-02-24 11:08:13 +01:00
lib	Add reject pattern to Admin setting (Ported to Glitch Soc)	2024-02-17 18:55:57 +01:00
mailers	Merge branch 'glitch-soc' into develop	2024-01-28 02:29:46 +01:00
models	Add reject pattern to Admin setting (Ported to Glitch Soc)	2024-02-17 18:55:57 +01:00
policies	Merge branch 'glitch-soc' into develop	2024-01-28 02:29:46 +01:00
presenters	Add annual reports for accounts (#28693)	2024-01-24 09:38:10 +00:00
serializers	Hydrate reactions on streaming API	2024-02-11 17:25:53 +01:00
services	Merge branch 'glitch-soc' into develop	2024-02-16 14:48:08 +01:00
validators	Add reject pattern to Admin setting (Ported to Glitch Soc)	2024-02-17 18:55:57 +01:00
views	Fix formatting of the filtering settings	2024-02-17 18:55:57 +01:00
workers	Merge branch 'glitch-soc' into develop	2024-01-28 02:29:46 +01:00