~cytrogen/masto-fe

ref: bb98d970e3f3333f85d454bc1fd26a1b582b14d2 masto-fe/app/javascript/mastodon/features/status d---------
bb98d970 — Claire 2 years ago
Merge pull request #2291 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream 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.
a8edbcf9 — Eugen Rochko 2 years ago
Fix dropdowns being disabled for logged out users in web UI (#25714)

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
000b8358 — Eugen Rochko 2 years ago
Add canonical link tags in web UI (#25715)

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
Rewrite `<LoadingIndicator/>` as FC and TS  (#25364)

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

Merge upstream changes
c48ec9cb — Claire 2 years ago
Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream

Conflicts:
- `config/initializers/content_security_policy.rb`:
  Kept our version, it was not affected by upstream's bug.
d8b0a732 — Claire 2 years ago
Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream

Conflicts:
- `config/initializers/simple_form.rb`:
  Upstream added a new simple_form component, where we had an extra one.
  Kept both components.
93c71441 — Claire 2 years ago
Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream

Conflicts:
- `package.json`:
  Upstream changed various script definitions in lines surrounding the one for
  `i18n:extract`, which had glitch-soc-specific changes.
  Updated the scripts as upstream did, while keeping our changes to
  `i18n:extract`.
e4fd9503 — Eugen Rochko 2 years ago
Change design of dropdowns in web UI (#25107)

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

Merge upstream changes up to 00c222377db0e305ac3f4a15bf1c18eb89c1f45f
c22fc2fa — Claire 2 years ago
Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream

Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's changes.
acc419b8 — Jed Fox 2 years ago
Fix spacing of middle dots in the detailed status meta section (#25247)

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

Merge upstream changes
69057467 — Christian Schmidt 2 years ago
Translate CW, poll options and media descriptions (#24175)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
64b960b6 — y.takahashi 2 years ago
Handle Surrogate Pairs in truncate() (#25148)

Next