~cytrogen/masto-fe

ref: 702d162998f8265cbbe731b943a4bd22e6a1c7bf masto-fe/config d---------
6f658680 — Claire 2 years ago
Merge pull request #2413 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to a83615edc9fc1ce3363ddcf1fc676806421a5f65
1e87575b — Claire 2 years ago
Merge commit '6eb6209d02514c5271238a23601be643c7b9f52d' into glitch-soc/merge-upstream
67eaaa4b — github-actions[bot] 2 years ago
New Crowdin Translations (automated) (#26966)

Co-authored-by: GitHub Actions <noreply@github.com>
1b4902fa — github-actions[bot] 2 years ago
New Crowdin Translations (automated) (#26913)

Co-authored-by: GitHub Actions <noreply@github.com>
743fede5 — Claire 2 years ago
Merge pull request #2406 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 6273416292090b2f6bfda33f070cea325a1759df
5ed72f66 — Claire 2 years ago
Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream
e193c848 — Claire 2 years ago
Merge commit '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' into glitch-soc/merge-upstream

Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream added some code to add the Identity Provider's sign-in endpoint to
  the `form-action` Content Security Policy directive but our version of the
  file is pretty different.
  Ported the change.
08b495d9 — Claire 2 years ago
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream
5d8c65f2 — Claire 2 years ago
Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream
a04ae162 — Claire 2 years ago
Fix CSP when using `ONE_CLICK_SSO_LOGIN` (#26901)

921c6fe6 — github-actions[bot] 2 years ago
New Crowdin Translations (automated) (#26498)

Co-authored-by: GitHub Actions <noreply@github.com>
20666482 — Robert R George 2 years ago
Added admin api for managing tags (#26872)

9a70cac9 — CSDUMMI 2 years ago
Fix #26849 by adding the domain of the current SSO provider to the form-action CSP (#26857)

e9b528ea — Renaud Chaput 2 years ago
Use NodeJS v20 by default (#26830)

475783d5 — Claire 2 years ago
Add timezone to datetimes in e-mails (#26822)

a1df9fdb — Claire 2 years ago
Merge pull request #2397 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
77caba37 — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream
cab4cbfa — Claire 2 years ago
Fix “Scoped order is ignored, it's forced to be batch order.” warnings (#26793)

e80b36d8 — Claire 2 years ago
Merge pull request #2396 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
e66f961e — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream
Next