Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 07:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,759 Commits 74 Branches 58 Tags
c34682d671ae19b5cf68f9c914d26d14512436de
Commit Graph

24759 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
c34682d671 Merge pull request #3021 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 1bc28709cc
 2025-03-30 21:32:34 +02:00
Renaud Chaput
0a39eac6fe [Glitch] Convert the polls reducer to plain JS 
Port 1bc28709cc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-30 12:21:05 +02:00
Claire
a3097e1e84 Merge commit '1bc28709ccde4106ab7d654ad5888a14c6bb1724' into glitch-soc/merge-upstream 2025-03-30 12:20:18 +02:00
Claire
3de6207805 Merge pull request #3020 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 04a9252a93
 2025-03-30 10:58:46 +02:00
Renaud Chaput
1bc28709cc Convert the polls reducer to plain JS (#33263) 2025-03-29 20:17:27 +00:00
Claire
20fc2e558c [Glitch] Fix incorrect locked account warning in composer 
Port 04a9252a93 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-29 19:20:13 +01:00
Claire
8efc381063 Merge commit '04a9252a93fe18aa514957765a35e0abe2596864' into glitch-soc/merge-upstream 2025-03-29 19:19:58 +01:00
Claire
04a9252a93 Fix incorrect locked account warning in composer (#34312) 2025-03-29 18:06:46 +00:00
Echo
e673e6c993 [Glitch] Remove react-motion library 
Port 902aab1245 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-29 17:15:52 +01:00
Claire
f8b0f38636 Merge commit '902aab1245a06319b7acd20045bd9ce051627300' into glitch-soc/merge-upstream 2025-03-29 17:02:39 +01:00
Claire
d6ecf503c1 Merge upstream changes up to e5fd61a84e (#3019) 
* Refactor `<Video>` to TypeScript (#34284)

* [Glitch] Refactor `<Video>` to TypeScript

Port e5fd61a84e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

---------

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2025-03-29 16:22:12 +01:00
Eugen Rochko
f19116c430 [Glitch] Refactor <Video> to TypeScript 
Port e5fd61a84e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-28 21:00:58 +01:00
Claire
c06527cf5d Merge commit 'e5fd61a84eb3a919c1e53f688e424df9d0f20924' into glitch-soc/merge-upstream 2025-03-28 20:48:53 +01:00
Claire
d924335d78 Reduce discrepancies with upstream in Video component (#3018) 2025-03-28 20:48:06 +01:00
Claire
51a8c6c3f7 Merge pull request #3017 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to e28b64ac2d
 2025-03-28 20:09:09 +01:00
Claire
a5eaa95bb2 Merge commit 'e28b64ac2dcd381f8b7e6bcfc2cc2b2ed3121cd9' into glitch-soc/merge-upstream 2025-03-28 18:48:04 +01:00
Echo
74ee96505a Upgrade Intl packages (#34306) 2025-03-28 17:30:02 +00:00
Claire
ee65f77a7e Add server-side support for grouping account sign-up notifications (#34298) 2025-03-28 12:35:25 +00:00
Echo
902aab1245 Remove react-motion library (#34293) 2025-03-28 12:34:51 +00: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
David Roetzel
97b9994743 Basic FASP support (#34031) 2025-03-28 12:16:40 +00:00
Eugen Rochko
e5fd61a84e Refactor <Video> to TypeScript (#34284) 2025-03-28 12:15:43 +00:00
github-actions[bot]
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]
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]
dd6c573cc3 New Crowdin Translations (automated) (#34276) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-26 07:42:25 +00:00
Shlee
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