Claire c85c3fb708 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `package.json`:
  Upstream updated `jest`, moving its config in a separate file.
  This config was modified in glitch-soc, so the corresponding changes have
  been ported to `jest.config.js`

2022-05-04 19:15:50 +02:00

..

chewy

Let votes statuses are also searchable (#18070)

2022-04-23 21:47:27 +02:00

controllers

Merge branch 'main' into glitch-soc/merge-upstream

2022-05-03 10:16:49 +02:00

helpers

Merge branch 'main' into glitch-soc/merge-upstream

2022-04-04 17:25:57 +02:00

javascript

Merge branch 'main' into glitch-soc/merge-upstream

2022-05-04 19:15:50 +02:00

lib

Merge branch 'main' into glitch-soc/merge-upstream

2022-05-01 16:52:27 +02:00

mailers

Fix failure when sending warning emails with custom text (#17983)

2022-04-07 14:47:30 +02:00

models

Merge branch 'main' into glitch-soc/merge-upstream

2022-05-01 16:52:27 +02:00

policies

Merge branch 'main' into glitch-soc/merge-upstream

2022-04-06 21:10:23 +02:00

presenters

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-08 20:22:54 +01:00

serializers

Merge branch 'main' into glitch-soc/merge-upstream

2022-04-25 17:09:32 +02:00

services

Merge branch 'main' into glitch-soc/merge-upstream

2022-05-03 10:16:49 +02:00

validators

Merge branch 'main' into glitch-soc/merge-upstream

2022-05-01 16:52:27 +02:00

views

Fix error due to glitch-soc's theming system

2022-05-01 17:07:11 +02:00

workers

Merge branch 'main' into glitch-soc/merge-upstream

2022-05-01 16:52:27 +02:00