~cytrogen/masto-fe

ref: c22fc2fa805a1919650bcfd7f66bc00493929e70 masto-fe/app/javascript/mastodon/features d---------
c22fc2fa — Claire 2 years ago
Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream

Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's changes.
fca2dff2 — Claire 2 years ago
Merge pull request #2237 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
14bb6bb2 — Claire 2 years ago
Fix `null` signUp URL in various places (#25190)

64b960b6 — y.takahashi 2 years ago
Handle Surrogate Pairs in truncate() (#25148)

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.
6dbd44fa — Claire 2 years ago
Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream
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
e2ab9d4d — Claire 2 years ago
Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream
45d73581 — Claire 2 years ago
Merge commit '8d6aea33260dedeacb3d22ac1a6d2f9cc3856a5e' into glitch-soc/merge-upstream
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)

e58c36d3 — Renaud Chaput 2 years ago
Update inconsistent `defaultMessage` (#25114)

1caa5ff3 — Eugen Rochko 2 years ago
Change share action from being in action bar to being in dropdown in web UI (#25105)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
40b948a1 — Renaud Chaput 2 years ago
Fix `null` signUp URL handling from #25014 (#25108)

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

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

Next