~cytrogen/masto-fe

ref: 82eebd048204be2cb99a3e4a27d1bce9a5e642c9 masto-fe/app/javascript/mastodon/features/notifications d---------
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.
a7ca33ad — Eugen Rochko 2 years ago
Add toast with option to open post after publishing in web UI (#25564)

f3c2035f — Claire 2 years ago
Merge pull request #2251 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
65cbcce9 — Claire 2 years ago
Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream
1cb4514d — Renaud Chaput 2 years ago
Add missing report category translation (#25400)

fca2dff2 — Claire 2 years ago
Merge pull request #2237 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
0669783d — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream
0e746671 — Claire 2 years ago
Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream

Conflicts:
- `.github/dependabot.yml`:
  We removed it from glitch-soc.
  Keep it deleted.
1cd7f5ff — Claire 2 years ago
Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream

Conflicts:
- `.eslintrc.js`:
  Upstream moved a configuration block in which we had added a glitch-only
  path.
  Moved the configuration block as upstream did.
- other files:
  Upstream reordered imports, and those files had different ones.
  Kept our version and reordered imports using the same rules.
8278907f — Claire 2 years ago
Merge commit '5a16bd7bf4591feb852364da9b84407438c9b7d6' into glitch-soc/merge-upstream
9381f781 — Claire 2 years ago
Merge commit '8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7' into glitch-soc/merge-upstream
0222df60 — Claire 2 years ago
Merge pull request #2236 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3
b7359549 — Claire 2 years ago
Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream

Conflicts:
- `config/webpack/generateLocalePacks.js`:
  A dependency update changed how functions are imported.
  Also, some linting fixes not applicable to glitch-soc.
38c62160 — fusagiko / takayamaki 2 years ago
Rewrite actions/modal and reducers/modal with typescript (#24833)

7336f364 — たいち ひ 2 years ago
Rewrite `<LoadGap />` as FC and TS (#25042)

d27216dc — Renaud Chaput 2 years ago
Enforce import order with ESLint (#25096)

5a16bd7b — Renaud Chaput 2 years ago
Use JSX syntax for Fragments (#25093)

8f66126b — Renaud Chaput 2 years ago
Use the new JSX transform (#25064)

054df2d6 — Claire 2 years ago
Merge pull request #2216 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
b878e3d8 — Nick Schonning 2 years ago
Enable ESLint react/no-deprecated (#24471)

Next