~cytrogen/masto-fe

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.
9e311f95 — fusagiko / takayamaki 2 years ago
[Glitch] simplify counters

Port e0d230fb37848efd788eea54a83869a63ff0fb39 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Rewrite `<ShortNumber />` as FC and TS

Port 20e85c0e837ef17219a1c317d7962286c9b4237d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
55ea7916 — Renaud Chaput 2 years ago
[Glitch] Convert `<DismissableBanner>` to Typescript

Port 4534498a8e43f59980ee56e9938efab8580c78c8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
0bfa4a99 — Renaud Chaput 2 years ago
[Glitch] Fix translate button position

Port 9f078e238d389199f9db42e408ec5606f5001417 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
7e54a30f — Claire 2 years ago
Merge commit '4534498a8e43f59980ee56e9938efab8580c78c8' into glitch-soc/merge-upstream
67055b03 — Claire 2 years ago
Fix import order inconsistencies (#2289)

41a50551 — Renaud Chaput 2 years ago
Remove unused `missed_update` state (#25832)

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

a8edbcf9 — Eugen Rochko 2 years ago
Fix dropdowns being disabled for logged out users in web UI (#25714)

ceeb2b8c — Eugen Rochko 2 years ago
Fix explore page being inaccessible when opted-out of trends in web UI (#25716)

93e8a154 — Eugen Rochko 2 years ago
Add forwarding of reported replies to servers being replied to (#25341)

e4cfe4b3 — Kurtis Rainbolt-Greene 2 years ago
First pass at multi-database for read replica using Rails native adapter (#25693)

Co-authored-by: emilweth <7402764+emilweth@users.noreply.github.com>
4534498a — Renaud Chaput 2 years ago
Convert `<DismissableBanner>` to Typescript (#25582)

Rewrite `<ShortNumber />` as FC and TS (#25492)

e0d230fb — fusagiko / takayamaki 2 years ago
simplify counters (#25541)

0f9b803e — Matt Jankowski 2 years ago
Regenerate brakeman ignore, pruning warnings (#25749)

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

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

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

Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream attempted something with tags.
  Kept our version.
Next