~cytrogen/masto-fe

ref: 22ee4e057d5fc46b7456cc20daacfc761c64b82d masto-fe/app/javascript/mastodon/features d---------
22ee4e05 — Claire 2 years ago
Merge commit 'a83615edc9fc1ce3363ddcf1fc676806421a5f65' into glitch-soc/merge-upstream

Conflicts:
- `streaming/index.js`:
  Upstream has added a parameter to `streamFrom`, while glitch-soc had an
  extra parameter.
  Ported upstream changes.
7ea5a2c8 — Claire 2 years ago
Merge pull request #2411 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 9688c5fcc4659491fa74783f616b1c23583398f1
70cae19b — Claire 2 years ago
Fix hashtag bar being sometimes incorrectly hidden (#26960)

9688c5fc — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream
893755f4 — Claire 2 years ago
Fix error in Web UI when server rules cannot be fetched (#26957)

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
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
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)

Next