~cytrogen/masto-fe

ref: b735954971a3e191fbfa1860e871724fafb9363d masto-fe/app/javascript/mastodon d---------
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.
7b54e47d — Claire 2 years ago
Fix being unable to load past a full page of filtered posts in Home timeline (#24930)

52d36f0f — Steven Munn 2 years ago
Fix spelling of "Lets" on the onboarding page after clicking the confirmation email (#24959)

Co-authored-by: Steven Munn <stevenjmunn@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
054df2d6 — Claire 2 years ago
Merge pull request #2216 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
5241f7b2 — Christian Schmidt 2 years ago
Fix UI crash in moderation interface when opening the media modal (#24816)

b8a24306 — Emelia Smith 2 years ago
Fix Onboarding Errors (#24883)

3869e8c2 — Eugen Rochko 2 years ago
Change "Sign in" to "Login" (#24942)

5eeb40bd — Renaud Chaput 2 years ago
Add stricter ESLint rules for Typescript files (#24926)

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

2d5e2579 — たいち ひ 2 years ago
Rewrite `logo.tsx` as FC (#24909)

6f8db56a — Renaud Chaput 2 years ago
Disable RTK safety middlewares (#24936)

facc7ab0 — Claire 2 years ago
Merge commit '51b83ed19536b06ce3f57b260400ecec2d1dd187' into glitch-soc/merge-upstream
1a664560 — Claire 2 years ago
Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' into glitch-soc/merge-upstream

Conflicts:
- `.github/dependabot.yml`:
  We deleted it.
  Kept it removed.
- `app/javascript/packs/public.jsx`:
  Upstream changed an import, we have slightly different ones.
  Ported upstream changes.
349cae0b — fusagiko / takayamaki 2 years ago
Add type annotation for DisplayName component (#24752)

ab7716cf — fusagiko / takayamaki 2 years ago
Rename Image component to ServerHeroImage (#24894)

c81d1b0d — Claire 2 years ago
Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/packs/admin.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did.
- `app/javascript/packs/public.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did.
8b568755 — Claire 2 years ago
Merge commit '89269e4b713e3291a5c8c29b8d2e7b950b60eb35' into glitch-soc/merge-upstream

Conflicts:
- `tsconfig.json`:
  Upstream changed the config to properly process imports.
  Glitch-soc had previously already done so.
  Changed the config to better match upstream.
51b83ed1 — Nick Schonning 2 years ago
Use Prettier for ESLint formatting TypeScript (#23631)

6aeb1629 — Renaud Chaput 2 years ago
Type Redux store and middleware (#24843)

224d458f — Renaud Chaput 2 years ago
Remove unused iOS agent sniffing function (#24931)

Next