treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
19,155 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

19155 Commits (a4890786e922a2df794d64445343244d9e8aef54)

Author SHA1 Message Date
Claire a4890786e9 Merge pull request #2411 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to f0850150f9
 2023-09-19 12:52:17 +02:00
Claire c5f333d647 [Glitch] Fix Web UI making duplicate search queries when scrolling 
Port c7d113e2d2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-18 12:12:55 +02:00
Claire 2803efb84e [Glitch] Fix error in Web UI when server rules cannot be fetched 
Port 11e4c747fc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-18 12:11:09 +02:00
Claire f0850150f9 Merge branch 'main' into glitch-soc/merge-upstream 2023-09-18 12:09:37 +02:00
Claire c7d113e2d2 Fix Web UI making duplicate search queries when scrolling (#26959) 2023-09-18 11:20:09 +02:00
Claire 11e4c747fc Fix error in Web UI when server rules cannot be fetched (#26957) 2023-09-18 09:51:52 +02:00
Claire 685d00e64f Fix `Setting.authorized_fetch` not being properly taken into consideration (#26958) 2023-09-18 09:37:29 +02:00
renovate[bot] 4ffa3c2d1d Update formatjs monorepo (#26955) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-18 08:52:49 +02:00
renovate[bot] f28698d4c0 Update babel monorepo to v7.22.20 (#26946) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-18 08:34:04 +02:00
Claire 1f7643db6d Merge pull request #2406 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 38fe6ecd05
 2023-09-16 09:57:00 +02:00
Claire eb817b5747 Revert tabs background color so they are easier to visually distinguish from contents 2023-09-16 09:50:00 +02:00
Claire c4da1fb1bd [Glitch] Fix dismiss button overlapping with text in dismissable banners 
Port e5e9e18c96 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 21:48:36 +02:00
Claire c31020044b Merge commit '38fe6ecd05e9349717b60452eff6e5ff4809b82b' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream modified this file close to a line modified by glitch-soc to
  disable the ARMv64 builder (as glitch-soc doesn't have one).
  Ported upstream's changes.
- `.github/workflows/build-releases.yml`:
  Upstream modified this file close to lines changed by glitch-soc to
  change the Docker image repositories used (only ghcr, and based on the
  organization's name).
  Ported upstream's changes.
 2023-09-15 21:43:49 +02:00
Claire 8c51fac1b6 Merge commit 'e7698cb4ab17ac9eebbaef64b29f8cb9772a5478' into glitch-soc/merge-upstream 2023-09-15 21:39:21 +02:00
Claire f0714c8106 [Glitch] Fix notification permissions being requested immediately after login 
Port f5f4f40955 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 21:33:28 +02:00
Santiago Kozak 082e969b4f [Glitch] Fix recent search items not handling overflows correctly 
Port 4b1c517e8e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 21:31:46 +02:00
Claire 3947d7a153 Merge commit 'aeae2ebc0159bc2caadfc52313545f8e69c035e7' 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.
 2023-09-15 21:25:05 +02:00
Eugen Rochko 660857bf06 [Glitch] Add recent searches in web UI 
Port 0f8203badd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 21:15:41 +02:00
Claire baba47c85a [Glitch] Fix confusing behavior of mute button and volume slider in web UI 
Port 850eca8ab0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 21:12:53 +02:00
Eugen Rochko cf03ddb5c8 [Glitch] Fix mute button and volume slider feeling disconnected in web UI 
Port bb0966bf85 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 21:12:13 +02:00
Eugen Rochko d22bbeb7e5 [Glitch] Change onboarding prompt to use full width of banner in web UI 
Port f56ca513fc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 21:09:28 +02:00
Claire 296e8f791e Merge commit '1efbb6202400d84024e68975c5cedd65efe71a80' into glitch-soc/merge-upstream 2023-09-15 21:06:45 +02:00
Claire 3f396a1b06 [Glitch] Add some information about Full-text search being disabled in search popout 
Port 1e8b335d70 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 21:01:40 +02:00
Claire 4127a9d9fe Merge commit 'a8d18668b2dd066e316c8bb0a712dd19911cdd59' into glitch-soc/merge-upstream 2023-09-15 20:57:40 +02:00
Eugen Rochko 054ae66061 [Glitch] Add infinite scrolling for search results in web UI 
Port 01e3a1f941 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 20:54:20 +02:00
Eugen Rochko fda4246c3a [Glitch] Add `in:` to search popout in web UI 
Port 3433972ed3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 20:33:51 +02:00
Claire 5cc06f5edc Merge commit '37e5129118019dae515a876c40b25b14ac976be2' into glitch-soc/merge-upstream 2023-09-15 20:21:40 +02:00
Claire e55eb73623 [Glitch] Improve interaction modal error handling 
Port a8a25dcbdb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 20:11:18 +02:00
Claire 9bb5ff5a62 Merge commit 'a8a25dcbdb63efb3191dbb3720c385209ffe4f34' into glitch-soc/merge-upstream 2023-09-15 20:08:09 +02:00
Claire 38fe6ecd05 Fix post edits not being forwarded as expected (#26936) 2023-09-15 19:54:32 +02:00
Claire e5e9e18c96 Fix dismiss button overlapping with text in dismissable banners (#26935) 2023-09-15 19:53:28 +02:00
Claire 4c9f14229f Fix obsolete cache key in status cache invalidation logic (#26934) 2023-09-15 19:52:28 +02:00
Renaud Chaput 3b1301eb7f Fix container build when cache is disabled (#26932) 2023-09-15 10:44:01 +02:00
Claire 12aa7c5219 Fix processing of `min_id` and `max_id` parameters in `/api/v2/search` (#26927) 2023-09-15 10:23:24 +02:00
renovate[bot] 720056fd25 Update dependency sass to v1.67.0 (#26914) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-15 10:03:55 +02:00
renovate[bot] ad7033cac5 Update dependency @babel/core to v7.22.19 (#26920) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-15 09:09:22 +02:00
Renaud Chaput 59c88c258e Change Dockerfile to upgrade packages when building (#26922) 2023-09-14 23:11:36 +02:00
Claire e7698cb4ab Bump version to v4.2.0-rc1 (#26916) 2023-09-14 18:46:00 +02:00
Eugen Rochko 3bb91e79f0 Change score half-life for trending posts from 2 hours to 1 hour (#26915) 2023-09-14 09:20:14 +02:00
Claire 323f9cd61a Fix CSP when using `ONE_CLICK_SSO_LOGIN` (#26901) 2023-09-13 19:54:04 +02:00
github-actions[bot] f933127c7f New Crowdin Translations (automated) (#26498) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-13 15:10:41 +02:00
Robert R George 6fb81e40fd Added admin api for managing tags (#26872) 2023-09-13 11:22:53 +02:00
renovate[bot] aeae2ebc01 Update dependency rails to v7.0.8 (#26907) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-13 10:01:31 +02:00
Jeong Arm 26c903c35b Fix Version metadata have trailing dot (#2403) 2023-09-13 08:47:39 +02:00
Plastikmensch 06221b90d2 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>
 2023-09-13 08:44:40 +02:00
Claire f5f4f40955 Fix notification permissions being requested immediately after login (#26472) 2023-09-12 18:27:01 +02:00
Claire fdeac75e50 Fix front-end bug when processing relationship-related account actions (#26902) 2023-09-12 16:30:03 +02:00
CSDUMMI 99e34fed97 Fix #26849 by adding the domain of the current SSO provider to the form-action CSP (#26857) 2023-09-12 13:04:51 +02:00
renovate[bot] 7497b4e076 Update dependency uuid to v9.0.1 (#26900) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-12 12:38:52 +02:00
Renaud Chaput 808c6f621b Fix Redux types (#26899) 2023-09-12 12:18:19 +02:00