Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 16:59:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,700 Commits 74 Branches 58 Tags
02d92d3b68601e34e540156e71f55d39b79bd459
Commit Graph

795 Commits

Author SHA1 Message Date
Claire
1ed3e4cc77 Merge commit '5478ef9b32be0c7ac8f86330760485a7531d218a' into glitch-soc/backports-4.4 2025-08-05 15:24:44 +02:00
Claire
cabb33bc49 Fix WebUI crashing for accounts with null URL (#35651) 2025-08-05 11:43:15 +02:00
Claire
e69c1479a8 Merge commit '77d2cdb30230ae6292bd247f6c6f97d00bd38084' into glitch-soc/backports-4.4 2025-07-23 18:10:05 +02:00
Claire
ee83f3a8b9 Always give local quote of remote posts a quote request URI (#35383) 2025-07-23 16:08:43 +02:00
Claire
c9a1e27a49 Merge commit 'dbb20f76a781defe35d077529c8269d712c1fbd2' into glitch-soc/merge-upstream 
Conflicts:
- `tsconfig.json`:
  glitch-soc had extra paths under `app/javascript/flavours`, but upstream
  added `app/javascript` as a whole, so updated to upstream's.
 2025-06-25 19:29:09 +02:00
Matt Jankowski
47fda2df2c Update OAuth inflection to match spec (#35160) 2025-06-25 07:52:30 +00:00
Claire
9cb5a77c3e Merge commit 'ac039d5f1323c46062d004896996f50549bfa38b' into glitch-soc/merge-upstream 2025-06-21 22:59:04 +02:00
David Roetzel
adf812efb3 Fix missing terms of services link (#35115) 2025-06-21 08:59:47 +00:00
Claire
2c751a6a19 Merge commit 'c644413f8a068490ddb8038441e5b59112e8294e' into glitch-soc/merge-upstream 2025-06-16 20:08:52 +02:00
Matt Jankowski
6f2aba989f Move "limited federation mode" config to x.mastodon area (#35041) 2025-06-16 06:13:03 +00:00
Claire
7da6b07c75 Merge commit '71d4ce1c228bab470fa9d3bcb5a130cf53665103' into glitch-soc/merge-upstream 2025-06-13 18:07:59 +02:00
Claire
e8868af079 Fix crash in StatusEdit serializer when quote posts are involved (#35036) 2025-06-13 14:59:52 +00:00
Claire
220b78d4a9 Merge commit '2254f47702368938bdfd0d997f2487fb2950d676' into glitch-soc/merge-upstream 2025-06-12 17:39:03 +02:00
Eugen Rochko
24d943fee0 Change media attachments in moderated posts to not be accessible (#34872) 2025-06-12 08:53:02 +00:00
Claire
2085b0b53a Merge commit '520974e05211e988b0447f7f29e88798b1794bcf' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/rest/status_serializer.rb`:
  Not a real conflict, just glitch-soc code textually adjacent to code added
  upstream.
 2025-06-05 18:02:40 +02:00
Claire
3d474807bf Change “legacy” non-fast-tracked quote posts to not be displayed as such (#34945) 2025-06-05 13:53:57 +00:00
Claire
c00e27aa55 Merge commit '54ad57ea9527a58ac2b95159ed178ed7c737a89c' into glitch-soc/merge-upstream 2025-05-30 17:41:31 +02:00
Matt Jankowski
f7a3dd0e38 Use config_for for VAPID key storage (#34845) 2025-05-30 07:00:33 +00:00
Claire
b031f65670 Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream 2025-05-25 14:51:59 +02:00
Claire
8c51a8ba94 Add ability to translate server rules (#34494) 2025-05-21 11:54:12 +00:00
Claire
a5a3a781e0 Merge commit '82688387a8d19906371a6dd4af64e5b662031603' into glitch-soc/merge-upstream 2025-05-09 18:16:46 +02:00
Claire
912268295c Change /api/v2/instance to be enabled without authentication when limited federation mode is enabled (#34576) 2025-05-09 07:46:57 +00:00
Claire
3ec3814f8e Merge commit '715cbee93d419e26cf952bf7fc70f9c1cc217d8b' into glitch-soc/merge-upstream 2025-05-03 17:37:26 +02:00
Claire
ae3b7dd28d Reject incoming QuoteRequest activities (#34480) 2025-04-25 23:28:09 +00:00
Claire
dae6f19490 Merge commit '7a70d9543525681b5c408cfd17782843da13177f' into glitch-soc/merge-upstream 2025-04-25 17:22:10 +02:00
Eugen Rochko
a97647158c Add REST API for featuring and unfeaturing a hashtag (#34489) 
Co-authored-by: Matt Jankowski <matt@jankowski.online>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-04-25 15:12:05 +00:00
Terence Eden
13b13c8726 Reduce path size for oEmbed and logo (#34538) 
Co-authored-by: Terence Eden <git@shkspr.mobi>
 2025-04-24 11:38:02 +00:00
Claire
7bc301e184 Make Web::PushSubscription#user and Web::PushSubscription#access_token relationships non-optional (#34498) 
Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
 2025-04-23 08:12:31 +00:00
Claire
dee744c793 Fix quote serializer (#34510) 2025-04-23 07:29:13 +00:00
Claire
ace0a3d61f Merge commit 'b33f9ea60338a78dde2fb7fe3f083c2ffaafcf1f' into glitch-soc/merge-upstream 2025-04-21 15:22:22 +02:00
Claire
df2611a10f Add initial support for ingesting and verifying remote quote posts (#34370) 2025-04-17 07:45:23 +00:00
Claire
80f7175379 Merge commit 'a296facdea884cc828999c9f9be0f4bc83afe68d' into glitch-soc/merge-upstream 2025-04-11 19:14:53 +02:00
Matt Jankowski
e753776930 Fix Style/HashTransformValues cop (#34416) 2025-04-11 08:09:40 +00: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
c43508b3e0 Add registrations.reason_required attribute to /api/v2/instance response (#34280) 2025-03-26 14:12:58 +00:00
Claire
971690caf2 Merge commit 'f7b1769e8a69e2831493f3a704d68efa5cf9beff' into glitch-soc/merge-upstream 2025-03-19 20:09:14 +01:00
Eugen Rochko
0099907600 Fix error when terms of service are missing an effective date (#34200) 2025-03-18 21:39:13 +00:00
Claire
0efa669fe9 Merge commit '2f98134ac69ee840095c9d8389e4b2fff72f20c1' into glitch-soc/merge-upstream 2025-03-15 17:49:32 +01:00
Eugen Rochko
d213c585ff Add age verification on sign-up (#34150) 2025-03-14 14:07:29 +00:00
Claire
dbd3e05812 Merge commit 'b57687083f4af178f2e2f43665eb4e49d32a50c2' into glitch-soc/merge-upstream 2025-03-07 17:37:36 +01:00
Eugen Rochko
cadda2f957 Add effective date to terms of service (#33993) 2025-03-05 09:01:33 +00:00
Claire
84164270c6 Add about, privacy_policy and terms_of_service URLS to /api/v2/instance (#33849) 2025-03-05 09:00:47 +00:00
Claire
c85616ee3a Merge commit 'f79b96a5ef0f6c4f57eee7f44ce2579b28a22098' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/feed_manager.rb`:
  Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
  Added upstream's code.
- `app/models/user_settings.rb`:
  Not a real conflict, glitch-soc has an extra setting textually-adjacent to a
  setting added upstream.
  Added upstream's setting.
- `app/serializers/initial_state_serializer.rb`:
  Same.
- `app/services/precompute_feed_service.rb`:
  Not a real conflict, glitch-soc has extra code for the direct feed.
  Added upstream's new code for populating lists.
 2025-02-01 19:07:13 +01:00
Eugen Rochko
1e70da5e3c Add reminder when about to post without alt text in web UI (#33760) 2025-01-29 11:37:56 +00:00
Claire
353e5f797c Merge commit '5b291fcbe41564264954618fb1f4086a3be1c600' into glitch-soc/merge-upstream 
Conflicts:
- `app/validators/poll_options_validator.rb`:
  Upstream split `PollValidator` in two, and glitch-soc had local changes to
  make the options configurable.
  Refactored as upstream did, keeping glitch-soc's configurable limits.
 2025-01-28 18:29:46 +01:00
Claire
32aa83e9d7 Fix polls not being validated on edition (#33755) 2025-01-28 14:38:18 +00:00
Claire
297eb7c956 Merge commit '4bd969e4bb54297981d385903bf8a4348b394f09' into glitch-soc/merge-upstream 
Conflicts:
- `CONTRIBUTING.md`:
  Upstream modified it while we quote upstream's within an otherwise different file.
  Applied upstream's changes.
 2025-01-18 12:42:17 +01:00
Christian Schmidt
a3baae0b99 API for updating attribution domains (#32730) 2025-01-17 08:18:55 +00:00
Claire
ab152ebed4 Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/status.rb`:
  Upstream refactored `visibility` handling to a concern, while glitch-soc had
  custom code adjacent to some of the changed lines.
  Applied upstream's changes.
- `lib/mastodon/version.rb`:
  Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's
  default github repository had been modified.
  Applied upstream's changes and updated `config/mastodon.yml` accordingly.
 2025-01-14 20:38:32 +01:00
S1m
4a2813158d Add support for standard webpush (#33528) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-01-14 09:14:00 +00:00