~cytrogen/masto-fe

ref: 53f5b27bd10e5f471b59cd0597d67ea12587c95a masto-fe/app/javascript/mastodon/actions d---------
19ebf779 — Claire 2 years ago
Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream
1da3c588 — Claire 2 years ago
Fix link handling of mentions in user profiles when logged out (#27185)

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

Merge upstream changes up to 57f592fed50747f3c97718a2761e17bafe6c8698
abdb5884 — Claire 2 years ago
Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream
4b7bc1f0 — Renaud Chaput 2 years ago
Convert `dropdown_menu` state to Typescript (#25585)

b93ffb74 — Renaud Chaput 2 years ago
Improve modals reducer types (#26610)

743fede5 — Claire 2 years ago
Merge pull request #2406 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 6273416292090b2f6bfda33f070cea325a1759df
e193c848 — Claire 2 years ago
Merge commit '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' into glitch-soc/merge-upstream

Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream added some code to add the Identity Provider's sign-in endpoint to
  the `form-action` Content Security Policy directive but our version of the
  file is pretty different.
  Ported the change.
08b495d9 — Claire 2 years ago
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream
3ca94f6d — Claire 2 years ago
Merge commit '93d051e47d27b5bd10be922a81d4d4eb6c306330' into glitch-soc/merge-upstream
520b5704 — Claire 2 years ago
Fix notification permissions being requested immediately after login (#26472)

bd06c132 — Renaud Chaput 2 years ago
Convert `actions/account_notes` into Typescript (#26601)

9b2bc3d1 — Eugen Rochko 2 years ago
Add recent searches in web UI (#26834)

5d20733d — Eugen Rochko 2 years ago
Add infinite scrolling for search results in web UI (#26784)

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

Merge upstream changes into glitch-soc
ffb48664 — Claire 2 years ago
Merge commit 'cb9f96036cf78835e22aafb30b80717b5a8b7394' into glitch-soc/merge-upstream
3c7dbf3a — Claire 2 years ago
Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' into glitch-soc/merge-upstream

Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `.github/workflows/build-push-pr.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `lib/mastodon/version.rb`:
  Upstream changed how the version string is built from environment variables.
  Adapted the logic to account for the `+glitch` in glitch-soc.
74eb7dbf — Tim Rogers 2 years ago
Fix bug with reblogged view on Toots only showing latest reblogging accounts (#26574)

ae6cf333 — Tim Rogers 2 years ago
Fix bug with favourited view on Toots only showing latest favouriting accounts (#26577)

71641766 — Eugen Rochko 2 years ago
Fix toast saying "published" instead of "saved" after editing post in web UI (#26664)

Next