~cytrogen/masto-fe

ref: f7a4d77d908e6de6ce823d13c9fac1b075d9f4f8 masto-fe/app/javascript d---------
f7a4d77d — Eugen Rochko 2 years ago
[Glitch] Add `in:` to search popout in web UI

Port d8bdba2f9fdfbb8feccfbe6cf6c42980a2ad5cc3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
3ca94f6d — Claire 2 years ago
Merge commit '93d051e47d27b5bd10be922a81d4d4eb6c306330' into glitch-soc/merge-upstream
e5269c6a — Claire 2 years ago
[Glitch] Improve interaction modal error handling

Port 548c032dbb90ae9c06b05fc05724c49d0b552fd9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
e14372c2 — Claire 2 years ago
Merge commit '548c032dbb90ae9c06b05fc05724c49d0b552fd9' into glitch-soc/merge-upstream
075ee0b2 — Plastikmensch 2 years ago
Fix wrong gradient color on collapsed private mentions (#2402)

Upstream changed the background color of private mentions, but the gradient used for collapsed toots still used the old color.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
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)

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

Merge upstream changes
d6f5c27f — Stanislas Signoud 2 years ago
[Glitch] Fix light mode colors for advanced interface banner

Port a106c464782cd8569acb2650867c4447d55cf240 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
e66f961e — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream
a106c464 — Stanislas Signoud 2 years ago
Fix light mode colors for advanced interface banner (#26759)

6b0702a3 — Plastikmensch 2 years ago
Add `recent` to search props (#2394)

The new search popout requires the `recent` prop to be set, otherwise onboarding crashes with "recent is undefined"

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
ee02b10e — Claire 2 years ago
Merge pull request #2392 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes into glitch-soc
5c7df20c — Claire 2 years ago
[Glitch] Add admin notifications for new Mastodon versions

Port front-end changes from 16681e0f20e1f8584e11439953c8d59b322571f5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
c107512f — Claire 2 years ago
Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream
4371df7f — Claire 2 years ago
[Glitch] Add `authorized_fetch` server setting in addition to env var

Port SCSS changes from 9e26cd55038084638fdf71b75f526494777d2849 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
728eb6a1 — Eugen Rochko 2 years ago
Fix wrong color on active icons with counters in web UI (#26767)

4ed629cd — Claire 2 years ago
Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream

Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream added the notion of overriden settings, while we had extra code for
  pseudo-settings (only used to combine flavour and skin in a single select
  field).
  Ported upstream changes.
- `config/i18n-tasks.yml`:
  Upstream added `simple_form.overridden` to `ignore_unused`,
  we had `simple_form.glitch_only`.
  Added `simple_form.glitch_only` as well.
Next