~cytrogen/masto-fe

ref: 9ae60f8738466746124f50ee261ea204db6b8537 masto-fe/app/javascript/styles d---------
9ae60f87 — Claire 2 years ago
Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream

Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream ran a lint fix on this file, but this file is different in
  glitch-soc because the feature was added much earlier.
  Ran the lint fix on our own version of the file.
2aadebc7 — Claire 2 years ago
Merge commit '8e0fd2d619dac93c193da6a762564244e5622498' into glitch-soc/merge-upstream

Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed how releases are tagged, we don't have releases.
  Ignored the changes
075887e1 — Claire 2 years ago
Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream
dd0002e1 — Claire 2 years ago
Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream

Conflicts:
- `app/models/trends.rb`:
  Conflict due to glitch-soc's code splitting trends mailing depending on type.
  Ported upstream's changes.
82eebd04 — Claire 2 years ago
Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream

Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream renamed an initial state parameter, where we had extra ones.
  Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
  Upstream wrapped database query in a block, we had extra database
  queries because of the DM timeline.
  Moved everything in the block.
7e54a30f — Claire 2 years ago
Merge commit '4534498a8e43f59980ee56e9938efab8580c78c8' into glitch-soc/merge-upstream
ecd8e0d6 — Renaud Chaput 2 years ago
Update Stylelint (#25819)

ca955ada — Stanislas Signoud 2 years ago
Use invariant colors on notification toasts (#25919)

ea10febd — Trevor Wolf 2 years ago
fix buttons showing inconsistent styles (#25903)

c27b82a4 — Claire 2 years ago
Add `forward_to_domains` parameter to `POST /api/v1/reports` (#25866)

338a0e70 — Eugen Rochko 2 years ago
Change label and design of sensitive and unavailable media in web UI (#25712)

a7ca33ad — Eugen Rochko 2 years ago
Add toast with option to open post after publishing in web UI (#25564)

9f078e23 — Renaud Chaput 2 years ago
Fix translate button position (#25807)

30ad9d97 — Claire 2 years ago
Merge pull request #2272 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
5de49e74 — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream
182fd93a — Trevor Wolf 2 years ago
fix read more button overlapping thread line bug (#25706)

69e124e2 — Eugen Rochko 2 years ago
Fix regression of icon button colors in web UI (#25679)

54cb679c — Trevor Wolf 2 years ago
Change button colors to increase hover/focus contrast and consistency (#25677)

8b4df95d — Claire 2 years ago
Merge pull request #2258 from ClearlyClaire/glitch-soc/merge-upstream

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