~cytrogen/masto-fe

ref: cf8b242c4c4ac25ed18864844f4d40df32314d5a masto-fe/app/javascript/mastodon d---------
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
5d8c65f2 — Claire 2 years ago
Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream
3ca94f6d — Claire 2 years ago
Merge commit '93d051e47d27b5bd10be922a81d4d4eb6c306330' into glitch-soc/merge-upstream
e14372c2 — Claire 2 years ago
Merge commit '548c032dbb90ae9c06b05fc05724c49d0b552fd9' into glitch-soc/merge-upstream
520b5704 — Claire 2 years ago
Fix notification permissions being requested immediately after login (#26472)

28752045 — Claire 2 years ago
Fix front-end bug when processing relationship-related account actions (#26902)

0712cc2b — Renaud Chaput 2 years ago
Fix Redux types (#26899)

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

91040da8 — Claire 2 years ago
Fix confusing behavior of mute button and volume slider in web UI (#26860)

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

f3a2e15f — Eugen Rochko 2 years ago
Fix mute button and volume slider feeling disconnected in web UI (#26827)

9c1ef830 — Claire 2 years ago
Add some information about Full-text search being disabled in search popout (#26756)

d8bdba2f — Eugen Rochko 2 years ago
Add `in:` to search popout in web UI (#26807)

9d290c23 — Eugen Rochko 2 years ago
Remove obfuscation of reply count in web UI (#26768)

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

548c032d — Claire 2 years ago
Improve interaction modal error handling (#26795)

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

Merge upstream changes into glitch-soc
c107512f — Claire 2 years ago
Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream
ac2dae0d — Claire 2 years ago
Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream

Conflicts:
- `.github/workflows/build-releases.yml`:
  Upstream changed comments close to a line we modified to account for
  different container image repositories.
  Updated the comments as upstream did.
Next