FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
19,162 Commits 3 Branches 0 Tags 211 MiB
Commit Graph

19162 Commits

Author SHA1 Message Date
Claire 1e87575b70 Merge commit '6eb6209d02514c5271238a23601be643c7b9f52d' into glitch-soc/merge-upstream 2023-09-19 12:53:32 +02:00
Claire 7ea5a2c82c
Merge pull request #2411 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 9688c5fcc4
 2023-09-19 12:52:17 +02:00
renovate[bot] 6eb6209d02
Update DefinitelyTyped types (non-major) (#26953) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-19 12:24:26 +02:00
renovate[bot] c6a535a197
Update dependency node to 20.7 (#26963) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-19 11:16:45 +02:00
renovate[bot] 6f9f901153
Update dependency postcss to v8.4.30 (#26964) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-19 11:03:42 +02:00
github-actions[bot] 67eaaa4b90
New Crowdin Translations (automated) (#26966) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-19 10:41:48 +02:00
Rob Thomas 200312e8be
Fix crash when viewing a moderation appeal and the moderator account has been deleted (#25900) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-18 17:41:32 +02:00
github-actions[bot] 1b4902fabf
New Crowdin Translations (automated) (#26913) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-18 13:46:07 +02:00
Claire 31dedf4697 [Glitch] Fix Web UI making duplicate search queries when scrolling 
Port 4c1518a6f3 to glitch-soc

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

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-18 12:11:09 +02:00
Claire 9688c5fcc4 Merge branch 'main' into glitch-soc/merge-upstream 2023-09-18 12:09:37 +02:00
Claire 4c1518a6f3
Fix Web UI making duplicate search queries when scrolling (#26959) 2023-09-18 11:20:09 +02:00
Claire 893755f4cb
Fix error in Web UI when server rules cannot be fetched (#26957) 2023-09-18 09:51:52 +02:00
Claire 392c07f2bf
Fix `Setting.authorized_fetch` not being properly taken into consideration (#26958) 2023-09-18 09:37:29 +02:00
renovate[bot] 8b5c61ae3a
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] 04623e2f34
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 743fede5be
Merge pull request #2406 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 6273416292
 2023-09-16 09:57:00 +02:00
Claire 60ecca6acb Revert tabs background color so they are easier to visually distinguish from contents 2023-09-16 09:50:00 +02:00
Claire d3f14dd7d4 [Glitch] Fix dismiss button overlapping with text in dismissable banners 
Port 2a4fcc51fd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 21:48:36 +02:00
Claire dfc05ec8df Merge commit '6273416292090b2f6bfda33f070cea325a1759df' 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 5ed72f668f Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream 2023-09-15 21:39:21 +02:00
Claire cf8b242c4c [Glitch] Fix notification permissions being requested immediately after login 
Port 520b570474 to glitch-soc

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

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 21:31:46 +02:00
Claire e193c848fe 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.
 2023-09-15 21:25:05 +02:00
Eugen Rochko 7384015505 [Glitch] Add recent searches in web UI 
Port 9b2bc3d1de to glitch-soc

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

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

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

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 21:09:28 +02:00
Claire 08b495d95c Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream 2023-09-15 21:06:45 +02:00
Claire 9f3df3edee [Glitch] Add some information about Full-text search being disabled in search popout 
Port 9c1ef8302a to glitch-soc

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

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

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 20:33:51 +02:00
Claire 3ca94f6d4a Merge commit '93d051e47d27b5bd10be922a81d4d4eb6c306330' into glitch-soc/merge-upstream 2023-09-15 20:21:40 +02:00
Claire e5269c6a65 [Glitch] Improve interaction modal error handling 
Port 548c032dbb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 20:11:18 +02:00
Claire e14372c2d1 Merge commit '548c032dbb90ae9c06b05fc05724c49d0b552fd9' into glitch-soc/merge-upstream 2023-09-15 20:08:09 +02:00
Claire 6273416292
Fix post edits not being forwarded as expected (#26936) 2023-09-15 19:54:32 +02:00
Claire 2a4fcc51fd
Fix dismiss button overlapping with text in dismissable banners (#26935) 2023-09-15 19:53:28 +02:00
Claire e4f5114aaf
Fix obsolete cache key in status cache invalidation logic (#26934) 2023-09-15 19:52:28 +02:00
Renaud Chaput 5d93e98da4
Fix container build when cache is disabled (#26932) 2023-09-15 10:44:01 +02:00
Claire 9693c271f1
Fix processing of `min_id` and `max_id` parameters in `/api/v2/search` (#26927) 2023-09-15 10:23:24 +02:00
renovate[bot] 82015dbab6
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] 3103415364
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 ef8ca2fd72
Change Dockerfile to upgrade packages when building (#26922) 2023-09-14 23:11:36 +02:00
Claire b90383d073
Bump version to v4.2.0-rc1 (#26916) 2023-09-14 18:46:00 +02:00
Eugen Rochko fc6825055b
Change score half-life for trending posts from 2 hours to 1 hour (#26915) 2023-09-14 09:20:14 +02:00
Claire a04ae16201
Fix CSP when using `ONE_CLICK_SSO_LOGIN` (#26901) 2023-09-13 19:54:04 +02:00
github-actions[bot] 921c6fe654
New Crowdin Translations (automated) (#26498) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-13 15:10:41 +02:00
Robert R George 20666482ef
Added admin api for managing tags (#26872) 2023-09-13 11:22:53 +02:00
renovate[bot] 97e4011c3c
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