~cytrogen/masto-fe

993d0a99 — Claire 2 years ago
Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream

Conflicts:
- `app/models/account.rb`:
  Upstream added new validations close to lines on which glitch-soc had
  modified validations to handle custom limits set through environment
  variables.
  Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
  Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
  completely different.
  Added `AZURE_ALIAS_HOST` to our version of the file.
3a141044 — github-actions[bot] 2 years ago
New Crowdin translations (#2338)

Co-authored-by: GitHub Actions <noreply@github.com>
1cc3fcf7 — Plastikmensch 2 years ago
Fix Public TL not indicating new toots when `onlyRemote` or `allowLocalOnly` is enabled (#2336)

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
feaf3cf7 — Plastikmensch 2 years ago
Fix firehose not indicating new toots in "All" (#2335)

When "Show local-only toots in All" is enabled, the column never indicated there are new toots, since `hasUnread` was always false.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
e69fe946 — Plastikmensch 2 years ago
Fix "All" live feed not loading automatically. (#2332)

The dispatch to expand the timeline was missing the `allowLocalOnly` param.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
8864d5b5 — github-actions[bot] 2 years ago
New Crowdin translations (#2327)

Co-authored-by: GitHub Actions <noreply@github.com>
6256cee0 — Claire 2 years ago
Change error boundary to upstream's (#2323)

cf9affde — Plastikmensch 2 years ago
Apply padding to all notifications in notif-cleaning mode (#2325)

* Add missing padding to notif-cleaning for admin-sign-up

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Apply padding to all notification types instead

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

---------

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
51311c19 — Plastikmensch 2 years ago
Fix CW icon being on wrong side in app settings in RTL languages (#2324)

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
944c2903 — Jeong Arm 2 years ago
Fix relationship-tag background color (#2322)

9ec43107 — github-actions[bot] 2 years ago
New Crowdin translations (#2319)

Co-authored-by: GitHub Actions <noreply@github.com>
49767d20 — Claire 2 years ago
Fix glitch local settings navigation items not being proper buttons (#2320)

dd09535b — Claire 2 years ago
Annotate doodle parameters to please eslint (#2321)

52500965 — Claire 2 years ago
Fix “Open in advanced web interface” being shown on mobile view (#2318)

Fixes #2307
9a45198a — github-actions[bot] 2 years ago
New Crowdin translations (#2317)

Co-authored-by: GitHub Actions <noreply@github.com>
e7cb6c6c — github-actions[bot] 2 years ago
New Crowdin translations (#2314)

Co-authored-by: GitHub Actions <noreply@github.com>
1e3b1923 — Claire 2 years ago
Add stricter protocol fields validation for accounts (#25937)

1cceb62a — Matt Jankowski 2 years ago
Fix `Lint/Void` cop (#25922)

a5842df1 — Matt Jankowski 2 years ago
Fix haml-lint Rubocop `Lint/UnusedBlockArguments` cop (#26039)

285a3df5 — Matt Jankowski 2 years ago
Move localized subject mailer shared example to separate file (#25889)

Next