~cytrogen/masto-fe

f5bd2014 — Claire 2 years ago
[Glitch] Fix sign up steps progress layout in right-to-left locales

Port 21ec596dabbe28a5cfc5b29362f46f47b48eb140 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
beb5fcd0 — Tim Rogers 2 years ago
[Glitch] Fix bug with reblogged view on Toots only showing latest reblogging accounts

Port 74eb7dbf2d79b74f7d6f09ca3d39b3ba67f5f7bf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
871ab848 — Tim Rogers 2 years ago
[Glitch] Fix bug with favourited view on Toots only showing latest favouriting accounts

Port ae6cf33321a9f240ef73666a552e552b65390012 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
ffb48664 — Claire 2 years ago
Merge commit 'cb9f96036cf78835e22aafb30b80717b5a8b7394' into glitch-soc/merge-upstream
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
cb9f9603 — gunchleoc 2 years ago
Add suggestion for secure cyphers to nginx.conf (#26349)

430eac3e — renovate[bot] 2 years ago
Update dependency @babel/preset-env to v7.22.14 (#26732)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
ef9a85a2 — renovate[bot] 2 years ago
Update dependency webpack-bundle-analyzer to v4.9.1 (#26733)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
15949e42 — renovate[bot] 2 years ago
Update dependency glob to v10.3.4 (#26734)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
5c38c3a9 — Claire 2 years ago
Change text extraction in `PlainTextFormatter` to be faster (#26727)

21ec596d — Claire 2 years ago
Fix sign up steps progress layout in right-to-left locales (#26728)

bba76e72 — Eugen Rochko 2 years ago
Change `language:` to attempt to match to a known value in search (#26663)

0e1bff17 — renovate[bot] 2 years ago
Update dependency chewy to v7.3.4 (#26717)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Next