~cytrogen/masto-fe

afc3b122 — Claire 2 years ago
Merge commit '4ad1c5aa7174e5cef4ba9608a44429916a119bee' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Upstream has updated their README, we have a completely different one.
  Kept ours.
- `config/initializers/content_security_policy.rb`:
  Upstream has updated their development CSPs, while we disable CSPs in
  the development environment.
  Kept our version.
6ee3e382 — Claire 2 years ago
Merge commit '0719216368bf3a90fdb7ab27201a0607b63ea203' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/packs/public.jsx`:
  Some of the removed dead code was split from this code in
  `app/javascript/core/public.js` and `app/javascript/core/settings.js`.
  Removed this dead code, and removed `app/javascript/core/public.js`
  altogether.
fbbe9f1c — Claire 2 years ago
Merge commit 'a7d96e6affd4a2da65f09f3f4ffa1b9350bb9a42' into glitch-soc/merge-upstream
cb50d95c — Eugen Rochko 2 years ago
[Glitch] Add search options to search popout in web UI

Port bceb8931591b4b9df6e8dcfb47864c230884262c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
c8aa3d6d — Claire 2 years ago
Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream
3c7dbf3a — Claire 2 years ago
Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' into glitch-soc/merge-upstream

Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `.github/workflows/build-push-pr.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `lib/mastodon/version.rb`:
  Upstream changed how the version string is built from environment variables.
  Adapted the logic to account for the `+glitch` in glitch-soc.
023673c0 — Claire 2 years ago
[Glitch] Add `data-nosnippet` attribute to remote posts and local posts with `noindex`

Port c3a42e1280759ea28bee11f241aef892b148bf6a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
6b7c4731 — Claire 2 years ago
Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream
4ad1c5aa — renovate[bot] 2 years ago
Update dependency aws-sdk-s3 to v1.133.0 (#26616)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
a67cf439 — renovate[bot] 2 years ago
Update dependency axios to v1.5.0 (#26680)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
25bf6406 — Claire 2 years ago
Add debug logging on signature verification failure (#26637)

075cc8e8 — Christian Schmidt 2 years ago
Improve Codespaces port forwarding (#26400)

286a21af — Christian Schmidt 2 years ago
Support webpacker live-reloading on Docker (#26419)

07192163 — Christian Schmidt 2 years ago
Remove dead code from public.jsx (#26547)

a7d96e6a — Lukas Martini 2 years ago
Improve error messages when DeepL quota is exceeded (#26704)

786e5866 — github-actions[bot] 2 years ago
New Crowdin translations (#2388)

Co-authored-by: GitHub Actions <noreply@github.com>
10b06436 — Eugen Rochko 2 years ago
Fix colors and typography on hashtag bar in web UI (#26666)

01b87a16 — Eugen Rochko 2 years ago
Change video compression parameters (#26631)

dd72a8d2 — renovate[bot] 2 years ago
Update dependency stoplight to v3.0.2 (#26698)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2304cc64 — Eugen Rochko 2 years ago
Fix bad search type heuristic (#26673)

Next