Merge pull request #2396 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes
[Glitch] Fix light mode colors for advanced interface banner Port a106c464782cd8569acb2650867c4447d55cf240 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge branch 'main' into glitch-soc/merge-upstream
Fix light mode colors for advanced interface banner (#26759)
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>
Merge pull request #2392 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes into glitch-soc
[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>
Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream
[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>
Fix wrong color on active icons with counters in web UI (#26767)
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.
[Glitch] Fix search popout including full-text search instructions when full-text search is disabled Port 6c4c72497a5722870e4432ef41dd4c9ec36a8928 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Allow filter form in profiles directory to wrap Port f1d250135ccf9be5c4d982a2c48417da89d38eb5 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Add an explanation banner on switching to single column mode Port 40b69cc1cd62fa57047905a6999985ae6c183f6c to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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.
[Glitch] Fix sign up steps progress layout in right-to-left locales Port 21ec596dabbe28a5cfc5b29362f46f47b48eb140 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Fix bug with reblogged view on Toots only showing latest reblogging accounts Port 74eb7dbf2d79b74f7d6f09ca3d39b3ba67f5f7bf to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Fix bug with favourited view on Toots only showing latest favouriting accounts Port ae6cf33321a9f240ef73666a552e552b65390012 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge commit 'cb9f96036cf78835e22aafb30b80717b5a8b7394' into glitch-soc/merge-upstream
Merge commit '0719216368bf3a90fdb7ab27201a0607b63ea203' into glitch-soc/merge-upstream Conflicts: - `app/javascript/packs/public.jsx`: Some of the removed dead code was split from this code in `app/javascript/core/public.js` and `app/javascript/core/settings.js`. Removed this dead code, and removed `app/javascript/core/public.js` altogether.