tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,739 Commits 5 Branches 0 Tags
a5eaa95bb24fc23bc630e977bdb8f6e8f20aa1ee
Commit Graph
24739 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire a5eaa95bb2 Merge commit 'e28b64ac2dcd381f8b7e6bcfc2cc2b2ed3121cd9' into glitch-soc/merge-upstream 2025-03-28 18:48:04 +01:00
Claire 6328599615 Merge pull request #3015 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 8a3bed1933
 2025-03-28 13:30:20 +01:00
github-actions[bot]andGitHub Actions e28b64ac2d New Crowdin Translations (automated) (#34297) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-28 09:47:53 +00:00
Matt Jankowski dfa4a97dd8 Fix intermittent account note failure by removing disappearing content check (#34296) 2025-03-28 09:24:36 +00:00
Claire c2defe0e4c Change account suspensions to be federated to recently-followed accounts as well (#34294) 2025-03-28 09:20:32 +00:00
Echo 3bfc576a49 [Glitch] Fix SASS deprecation notices 
Port 8a3bed1933 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-27 21:29:33 +01:00
Claire e8a652a8dd Fix win95 theme 2025-03-27 20:46:46 +01:00
Claire eb8dd42de0 Merge commit '8a3bed1933b7afdaa196639b753f41e743c4491a' into glitch-soc/merge-upstream 2025-03-27 20:31:48 +01:00
Claire ca204e66e3 Merge pull request #3014 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to aa575341c2
 2025-03-27 20:31:29 +01:00
scarf d5ff3ee4a0 [Glitch] feat: use <time> tag 
Port e9fe01e2a6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-27 19:42:37 +01:00
Claire 166514d252 Merge commit 'aa575341c2da1e84d349ca0b42211b0da30a2254' into glitch-soc/merge-upstream 2025-03-27 19:40:04 +01:00
Matt Jankowski 0479efdbb6 Fix intermittent failure on account note system spec (#34295) 2025-03-27 15:09:09 +00:00
Matt Jankowski ef879a532f Convert activitypub/* controller specs to request specs (#33992) 2025-03-27 14:55:13 +00:00
Matt Jankowski 445aa4ac72 Convert activitypub/inboxes spec controller->request (#34292) 2025-03-27 13:52:48 +00:00
Claire 1326088110 Change AccountReachFinder to consider statuses based on suspension date (#34291) 2025-03-27 13:41:13 +00:00
Echo 8a3bed1933 Fix SASS deprecation notices (#34278) 2025-03-27 13:09:42 +00:00
renovate[bot] aa575341c2 chore(deps): update dependency rubocop to v1.75.1 (#34286) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-03-27 08:19:17 +00:00
github-actions[bot]andGitHub Actions 99f93e675a New Crowdin Translations (automated) (#34290) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-27 08:07:54 +00:00
Matt Jankowski 0e3ff680d3 Update rubocop to version 1.75.0 (#34283) 2025-03-27 07:48:19 +00:00
Claire d5d5501a22 Merge pull request #3013 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to c43508b3e0
 2025-03-26 20:21:42 +01:00
Claire 449dc30739 Merge commit 'c43508b3e0b05c5e739d726bad53f1eef89e9376' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/content_security_policy.rb`:
  Upstream added support for `EXTRA_MEDIA_HOSTS` which is very similar to
  glitch-soc's `EXTRA_DATA_HOST`.
  Deprecate `EXTRA_DATA_HOST` FOR `EXTRA_MEDIA_HOST`.
 2025-03-26 19:14:26 +01:00
Claire 21c05f838d Merge pull request #3012 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to c93b2c6809
 2025-03-26 18:44:06 +01:00
Claire 7e8a06ba94 [Glitch] Add new filter action to blur media 
Port c93b2c6809 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-26 18:22:06 +01:00
Claire 9c5c86c947 Merge commit 'c93b2c6809905d24262b5973efe20832f1b04a6d' into glitch-soc/merge-upstream 2025-03-26 18:18:07 +01:00
scarf e9fe01e2a6 feat: use <time> tag (#34131) 2025-03-26 16:14:08 +00:00
Claire c43508b3e0 Add registrations.reason_required attribute to /api/v2/instance response (#34280) 2025-03-26 14:12:58 +00:00
David Roetzel 02db065571 Use fixed order in flaky spec (#34279) 2025-03-26 13:26:24 +00:00
Claire 59e189ad3c Add support for paginating partial collections in SynchronizeFollowersService (#34277) 2025-03-26 11:33:59 +00:00
github-actions[bot]andGitHub Actions dd6c573cc3 New Crowdin Translations (automated) (#34276) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-26 07:42:25 +00:00
ShleeandClaire 803a8be998 Add EXTRA_MEDIA_HOSTS environment variable to add extra hosts to Content-Security-Policy (#34184) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-26 07:42:15 +00:00
Claire c93b2c6809 Add new filter action to blur media (#34256) 2025-03-26 07:31:05 +00:00
Matt Jankowski 2a181f56e3 Convert settings/deletes spec controller->request/system (#34274) 2025-03-26 07:26:28 +00:00
Jeong Arm 2d248620d6 Merge pull request #2972 from tribela/fix-secondary-button 
Fix secondary post button alignment
 2025-03-25 22:08:56 +01:00
Claire f34326c30c Merge pull request #3010 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 94d71c992e
 2025-03-25 22:08:47 +01:00
Eugen Rochko b67fc9c099 [Glitch] Refactor alerts to TypeScript, remove react-notification dependency 
Port 94d71c992e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-25 21:23:24 +01:00
Claire 4ace929129 Merge commit '94d71c992e0fd88fc3a3fc92b598f139c874ab3f' into glitch-soc/merge-upstream 2025-03-25 21:12:37 +01:00
Claire 1b95c60974 Merge pull request #3009 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to e1dbbf6c9d
 2025-03-25 21:12:01 +01:00
Claire 6301287e73 [Glitch] Fix bookmarks and favourites not being filtered 
Port 2eb6d815d6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-25 20:05:55 +01:00
Claire 53d07e2afe [Glitch] Fix filters not applying in detailed view 
Port 8c3eeb4d29 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-25 20:05:21 +01:00
Claire 745c445e7e Merge commit 'e1dbbf6c9db6dbf3f356dae4c59fa05299372370' into glitch-soc/merge-upstream 2025-03-25 19:59:59 +01:00
Eugen Rochko 94d71c992e Refactor alerts to TypeScript, remove react-notification dependency (#34239) 2025-03-25 18:25:07 +00:00
Matt Jankowski e1dbbf6c9d Isolate assertions in v2/notifications intermittent failure cases (#34271) 2025-03-25 16:22:41 +00:00
Claire 3edac14f02 Fix follower synchronization mechanism erroneously removing followers from multi-page collections (#34272) 2025-03-25 15:50:05 +00:00
Echo 81b88095b4 Allow devcontainer to be accessed from local network (#34269) 2025-03-25 15:20:56 +00:00
Claire 2eb6d815d6 Fix bookmarks and favourites not being filtered (#34260) 2025-03-25 15:20:36 +00:00
Claire 8c3eeb4d29 Fix filters not applying in detailed view (#34259) 2025-03-25 13:11:49 +00:00
ClaireandDamien Mathieu 38f5e74122 Add Deprecation headers on deprecated endpoints (#34262) 
Co-authored-by: Damien Mathieu <42@dmathieu.com>
 2025-03-25 12:30:10 +00:00
renovate[bot] 40bb8ec325 chore(deps): update dependency selenium-webdriver to v4.30.1 (#34250) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-03-25 10:18:00 +00:00
renovate[bot] ef8f62c382 chore(deps): update dependency mime-types to v3.6.2 (#34266) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-03-25 09:09:25 +00:00
Matt Jankowski 9bba2aab33 Convert intents spec controller->request (#34261) 2025-03-25 09:07:22 +00:00