tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,556 Commits 5 Branches 0 Tags
Commit Graph

972 Commits

Author SHA1 Message Date
Claire
a7f46757eb Change /api/v1/statuses/:id/history to always return at least one item (#25510) 2026-07-11 13:42:14 -04:00
Claire
2f491f0d48 Merge commit 'b5e771b89e7b55b9feb301d257e2d4dc7ca46c1d' into glitch-soc/merge-4.6 
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the Mastodon API version.
   Did it as well.
 2026-06-23 18:01:59 +02:00
nicole mikołajczyk
30b1bf86fa Accept avatar_description and header_description in /api/v1/accounts/update_credentials (#39547) 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-06-23 17:35:29 +02:00
Claire
e08c8b6933 Merge commit 'b48f907b20e2c9909665a484041845697d26f17c' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/settings_helper.rb`:
  Upstream added a new helper.
  Conflict caused by the fact there is a glitch-soc specific helper.
  Added upstream's new helper in addition to glitch-soc's.
 2026-06-09 21:30:54 +02:00
David Roetzel
b48f907b20
Add Deprecation headers to collections alpha API (#39349) 2026-06-09 15:40:01 +00:00
Evan Prodromou
9c493c20b9
Add policy to filter notifications from bots (#38494) (#38809) 2026-06-09 12:28:53 +00:00
David Roetzel
4fcb28e081
Collections API: Set a maximum for the pagination limit param (#39342) 2026-06-09 10:31:58 +00:00
Claire
ae2ff31f32 Merge commit '0caf334891e0a5f4e995f1d667eb83d3aad7e41e' into glitch-soc/merge-upstream 
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream updated the API version, while we also have a custom glitch API version.
  Updated as upstream did.
 2026-05-30 12:13:35 +02:00
David Roetzel
572612fde9
Remove collections feature flag (#39211) 2026-05-29 09:37:42 +00:00
David Roetzel
6d3182a6eb
Move Collections API to v1 namespace (#39210) 2026-05-29 08:39:51 +00:00
Claire
06176deee2 Merge commit 'd20d04922672ed016029c40ed64798f341ebca91' into glitch-soc/merge-upstream 2026-05-26 20:48:49 +02:00
nicole mikołajczyk
6b2616453f
Make it possible to retrieve both resolved and unresolved reports by api (#38323) 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-05-23 11:07:02 +00:00
Claire
0c80bf0e82 Merge commit 'fcf012c6026418b6c76bff173eec944e0c25913f' into glitch-soc/merge-upstream 
Conflicts:
- `vite.config.mts`:
  Upstream changed a line adjacent to one glitch-soc modified due to its theming system.
  Adapted upstream's change.
- `yarn.lock`:
  Upstream updated a dependency next to one glitch-soc added.
  Updated the dependency as upstream did.
 2026-05-19 20:40:57 +02:00
Matt Jankowski
5f33cf0b0a
Extract api/v1/statuses#context to standalone controller (#38348) 2026-05-19 07:15:35 +00:00
Claire
6935fce458 Merge commit 'ba83509ff4ed3f7193f3ca5c5deb3038c39620b1' into glitch-soc/merge-upstream 2026-05-04 21:08:25 +02:00
Eugen Rochko
ee88da4511
Add admin UI for managing email subscriptions (#38741) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-04 13:56:04 +00:00
Claire
44394878a4 Merge commit 'c6facd27ed191177afb003640b8ee7d0742c7f63' into glitch-soc/merge-upstream 2026-04-30 19:00:48 +02:00
Claire
5b395774c0
Add fallback attributes to notifications for new and infrequent notifications (#38832) 2026-04-29 15:53:29 +00:00
Claire
7a4747122e Merge commit 'ca5c0a144ade4bff7bd10446a39d86116879884e' into glitch-soc/merge-upstream 
- `CODE_OF_CONDUCT.md`:
  Adopt upstream's new Code of Conduct
 2026-04-01 19:11:21 +02:00
Eugen Rochko
93dcca7f12
Add email subscriptions to profiles in web UI (#38487) 2026-04-01 14:24:28 +00:00
Claire
2ac493ee8e Merge commit '9d5e10a70e006c1c0bc61e7f591b1078c7be6ab4' into glitch-soc/merge-upstream 2026-03-26 18:23:45 +01:00
Matt Jankowski
b321d5d377
Use resources to declare API TOS access endpoints (#38416) 2026-03-26 14:07:06 +00:00
Claire
79958d9442 Merge commit '31abef8917879917a330419fe3981a2fb7f35b69' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/post_status_service.rb`:
  Upstream added a line adjacent to one that had been modified due to local-only posting.
  Added upstream's change.
- `tsconfig.json`:
  Upstream updated Typescript and updated `tsconfig` in the process by changing paths, where
  glitch-soc had extra paths. Updated as upstream did.
 2026-03-25 21:36:32 +01:00
Eugen Rochko
bcf0718a9a
Add email subscriptions (#38163) 2026-03-25 16:25:45 +00:00
Claire
04bf07a9cf Merge commit 'c37bc5a8a94758e19b2d50db5e7816a96cec5cf4' into glitch-soc/merge-upstream 2026-03-17 18:01:07 +01:00
Matt Jankowski
f07e84f9de
Rescue JSON::ParserError where already converted (#38244) 2026-03-17 08:57:10 +00:00
Claire
73f77c49d8 Merge commit '16c41e035bdd6e08927c950aeeb5332adbe8b6d5' into glitch-soc/merge-upstream 
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the Mastodon API version, glitch-soc has an extra glitch version.
  Bumped the Mastodon API version as upstream did.
 2026-03-16 18:16:56 +01:00
Matt Jankowski
3832030711
Convert Oj.load -> JSON.parse in most places (#38236) 2026-03-16 16:38:19 +00:00
Matt Jankowski
092acbd47b
Use to_json call for pins API (#38231) 2026-03-16 15:06:22 +00:00
Matt Jankowski
8ed13bc6f7
Use to_json call for accounts API (#38226) 2026-03-16 14:40:03 +00:00
Matt Jankowski
7933fa4f94
Use to_json call in donation campaigns (#38223) 2026-03-16 14:32:05 +00:00
Claire
b7246518bf
Add avatar_description and header_description parameters to PATCH /api/v1/profile (#38221) 2026-03-16 14:04:25 +00:00
Claire
4359098740 Merge commit '9c8be1e72146af247e2b6cdae6e1d37371506569' into glitch-soc/merge-upstream 2026-03-16 12:17:49 +01:00
Matt Jankowski
e2bf09d57d
Add timestamp spec for markers API response (#38206) 2026-03-16 08:48:10 +00:00
Claire
45b87f31ff Merge commit 'a3aeae02885408381c7c1f3f6a0cc88799823409' into glitch-soc/merge-upstream 2026-03-03 18:12:16 +01:00
Claire
a3aeae0288
Add test to cover proper URL for media in DELETE /api/v1/statuses/:id (#38037) 2026-03-03 15:36:54 +00:00
Claire
0e1ea3110e Merge commit '7f16397f3c37a8e378239974b73afbfe2b6e6844' into glitch-soc/merge-upstream 
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the mastodon API version, glitch-soc has a change on an adjacent
  line adding a glitch API version.
 2026-02-27 21:25:37 +01:00
Matt Jankowski
7e5e96739f
Use consistent calling style for TagManager#normalize_domain (#35764) 2026-02-27 16:38:34 +00:00
Matt Jankowski
9762b4a75c
Use normalizes for tag name attribute (#37119) 2026-02-27 15:56:08 +00:00
Claire
c15c49b5b6 Merge commit '1e87bd178d96ab7d760f019fcf651ecc1585e701' into glitch-soc/merge-upstream 2026-02-24 15:14:25 +01:00
Claire
43ef9f66b6
Add PATCH /api/v1/profile (#37934) 2026-02-24 10:48:56 +00:00
Claire
85f72a3940 Merge commit '6ba6285a73c3a8b281123814d45f534e3bcebb96' into glitch-soc/merge-upstream 2026-02-20 21:08:06 +01:00
Claire
cc1e65dcec
Add GET /api/v1/profile (#37912) 2026-02-20 10:16:04 +00:00
Claire
b041869887 Merge commit '3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b' into glitch-soc/merge-upstream 2026-02-18 18:40:03 +01:00
Nicholas La Roux
438602c488
Upgrade rubocop from v1.84.0 to v1.84.2, update config, and correct offences (#37795) 2026-02-17 14:56:46 +00:00
Claire
f47e2937cf Merge commit '0b66e744263a4af1f14d03886ea2a9da4ca156db' into glitch-soc/merge-upstream 2026-02-17 12:11:33 +01:00
Claire
0b66e74426
Add GET /api/v1/donation_campaigns (#37880) 2026-02-17 10:54:21 +00:00
Claire
ddc7df2064 Merge commit '6c3bd944f8890e1a349bd06e9585cb5ec25507e6' into glitch-soc/merge-upstream 2026-02-13 13:03:51 +01:00
David Roetzel
6c3bd944f8
Allow reporting (local) Collections (#37848) 2026-02-13 11:11:44 +00:00
Claire
59e02a628d Merge commit 'f652c54c3334890176331f62150559a96eeb41ae' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/backup_service.rb`:
  Upstream refactored activity serialization while glitch-soc passed an extra argument.
  Followed upstream's refactor, keeping our extra argument.
 2026-02-05 12:43:12 +01:00