tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,670 Commits 5 Branches 0 Tags
3a973e4dddef4e459d0efb2cd0ebee7b09cacd62
Commit Graph
2713 Commits
Author SHA1 Message Date
Claire f7991accd3 Change /api/v1/statuses/:id/history to always return at least one item (#25510) 2026-09-18 04:37:35 -04:00
Claire 222dfdf233 Merge commit '8f1847df31f5195abb427854fa1e2bf1e8ba23a0' into glitch-soc/stable-4.6 2026-09-15 15:29:20 +02:00
Claire db101e1331 Fix notifications not being cleaned up when notification requests are deleted in bulk (#40393) 2026-09-15 10:23:32 +02:00
Claire 3a5da4cb92 Merge commit '5e1ec8b18a48b36b0fc66f04292df9c519b21883' into glitch-soc/stable-4.6 2026-09-01 16:07:09 +02:00
Claire f7cf4e4dd2 Fix GHSA-vx32-x96w-qq65 2026-09-01 14:33:36 +02:00
Juan Hernández Babón 63eae9292e Fixes GHSA-62j4-hvj7-px3f 2026-09-01 14:33:35 +02:00
David Roetzel 1fcb02d612 Add another permission check to admin area (#39974) 2026-09-01 14:33:35 +02:00
Claire 2db065960d Merge commit '70ca3d5ee7042810636f7270ce942ad176a98209' into glitch-soc/merge-4.6 2026-08-28 19:05:15 +02:00
ClaireandShlee 3ccfbbe195 Fix various off-by-one errors in statistics time ranges (#40193) 
Co-authored-by: Shlee <github@shl.ee>
 2026-08-21 18:04:11 +02:00
Claire 1403a21fe8 Merge commit 'd74bbd9a3c64740433e016dfc936e83d710858f6' into glitch-soc/merge-4.6 2026-08-13 18:41:35 +02:00
Claire 170f23bb24 Fix Web UI being inaccessible with URLs ending with .zip (#40134) 2026-08-13 14:42:43 +02:00
Claire 77b7951de8 Fix domain block impact queries being rejected (#40122) 2026-08-13 14:42:43 +02:00
Claire 2be3994558 Merge commit '930aa9fee26bf9eaefe27826fa1061288d83373b' into glitch-soc/stable-4.6 2026-07-27 16:05:45 +02:00
Claire 930aa9fee2 Merge commit from fork 
* Fix GHSA-7jvv-fhmg-wpfw

* Fix GHSA-hx34-2pfw-2qfj

* Fix GHSA-vwhj-3g83-v276

* Bump version to v4.6.4
 2026-07-27 16:02:01 +02:00
Claire 5ed695d4f3 Merge commit '35fce54cc29466b848eef9b721be810f77fd78f2' into glitch-soc/merge-4.6 
Conflicts:
- `app/lib/activitypub/parser/status_parser.rb`:
  Upstream refactored this class while glitch-soc had an additional method.
  Moved the private methods as upstream did while keeping glitch-soc's extra one.
- `spec/lib/activitypub/activity/create_spec.rb`:
  glitch-soc had extra tests.
  Added upstream's new tests alongside the glitch-soc-specific ones.
 2026-07-22 18:58:43 +02:00
Claire d813ddd1db Fix Web Push subscription deletion endpoint incorrectly expecting anti-CSRF tokens (#39918) 2026-07-22 18:39:38 +02:00
Claire 1285172f2a Merge commit 'd7bb36a64a842dfac52fb1cfb0fcd6646981fb38' into glitch-soc/merge-4.6 2026-07-19 11:29:44 +02:00
Shlee ef1a880fe1 Fix: Admin invite autofollow option is ignored (#39819) 2026-07-16 14:47:44 +02: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
David Roetzel 7608436b64 Add route constraint to only allow numeric ids (#39523) 2026-06-23 11:17:54 +02:00
Claire 08027edb10 Merge commit 'b902c825054b953599cd0341acf428332fca5044' into glitch-soc/merge-upstream 2026-06-12 18:37:02 +02:00
Pia B. 35f3748482 Add import for custom filters (#39256) 2026-06-11 16:32:46 +00:00
Shlee 640cc39869 Typo in authorize_interactions_controller.rb (#39376) 2026-06-11 13:05:25 +00:00
Claire 89c2ac444f Merge commit '9e0a3aaf08e7d4fc700f7f19d61f5f8fee346b6a' into glitch-soc/merge-upstream 2026-06-10 18:52:58 +02:00
David Roetzel 008f377a37 Redirect if collection AP ID is requested as HTML (#39361) 2026-06-10 15:54:50 +00:00
David Roetzel 70bb70c2e6 Add meta tags to Collection HTML (#39357) 2026-06-10 13:28:52 +00: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
Matt Jankowski e0fc0858a1 Use http POST on rules acceptance button during registration (#39345) 2026-06-09 15:39:24 +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
Eugen Rochko ea5b613796 Add ability to view individual newsletters in admin UI (#39271) 2026-06-08 07:05:27 +00:00
Claire c2e6cbb12b Merge commit 'ead13d4826a7ba1699d6bb310e58642b15687671' into glitch-soc/merge-upstream 2026-06-07 14:29:57 +02:00
Claire 62bcdc41fc Allow authorized_interactions endpoint to handle Collections (#39287) 2026-06-05 07:54:55 +00:00
Claire 3cf0fb7ba0 Merge commit 'facb552c9cdbe8a2ebff0b94ebf2c9e9ec385347' into glitch-soc/merge-upstream 2026-06-01 18:00:03 +02:00
Matt Jankowski 8d4f9a97fe Move by_domain/local interaction check to filter (#39216) 2026-06-01 14:52:19 +00:00
Claire 1bd13af546 Fix error handling for invalid keys in signature verification (#39235) 2026-06-01 13:20:23 +00:00
Pia B.andClaire f6c156197e Add export for custom filters (#39085) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-01 09:56:17 +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 487c814eb9 Merge commit '6a4d14b178fc00de989b4a2758f2a1e4adf5ed33' into glitch-soc/merge-upstream 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Glitch-soc allows a wider range of HTML than upstream.
  Upstream added `:all => %w(lang)`, which was not supported by glitch-soc,
  added it there too.
 2026-05-22 19:43:42 +02:00
David Roetzel e18ca373eb Revert "Add partial accounts to collections endpoint (#38919)" (#39128) 2026-05-21 13:45:09 +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 1232b55211 Use mime type symbol to set content_type for custom css response (#37845) 2026-05-19 07:16:24 +00:00
Matt Jankowski 5f33cf0b0a Extract api/v1/statuses#context to standalone controller (#38348) 2026-05-19 07:15:35 +00:00
Claire 42ec9a607b Merge commit 'c26003af215da7696e2b0dcece7fa695b1be8871' into glitch-soc/merge-upstream 2026-05-18 19:35:08 +02:00