~cytrogen/masto-fe

5914dfdd — Claire 2 years ago
[Glitch] Change thread view to scroll to the selected post rather than the post being replied to

Port e4ea80d8089110790bf11f7d4021dbe7b6a866de to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
42f36aa5 — Claire 2 years ago
Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream

Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream fixed an issue that was not present in glitch-soc.
  Kept our version.
7635c674 — Claire 2 years ago
Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream

Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream removed the `crossorigin` attribute from `preload_pack_asset`.
  Glitch-soc had different calls to `preload_pack_asset` because of the
  different theming system.
  Ported the change.
- `app/views/layouts/embedded.html.haml`:
  Upstream removed the `crossorigin` attribute from `preload_pack_asset`.
  Glitch-soc had different calls to `preload_pack_asset` because of the
  different theming system.
  Ported the change.
f05effeb — Stanislas Signoud 2 years ago
[Glitch] Fix a missing redirection on getting-started in multi column mode

Port 586b1c9dca07c894af4248f59c847e7a3bf6d786 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
d3d61472 — Christian Schmidt 2 years ago
[Glitch] Wrong count in response when removing favourite/reblog

Port 4c18928a931c8dc149fa3e0bd7de8ce4f6242715 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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>
Next