tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,688 Commits 5 Branches 0 Tags
82f7cdcb48e806b4f42e7de93c53d52d137b9ed2
Commit Graph
681 Commits
Author SHA1 Message Date
Claire 5b926157e8 Merge commit '6188de3efc293a6327cabcb858430aa79564dfd7' into glitch-soc/merge-upstream 2026-02-02 18:26:04 +01:00
Matt Jankowski 9de54635ed Add coverage for "too many IDs" scenario in api/v1/statuses (#37699) 2026-02-02 15:11:15 +00:00
Claire b14cbb3ee9 Merge pull request #3364 from ClearlyClaire/glitch-soc/features/local-only-drop-emoji 
Deprecate eye emoji in favor of a bespoke API parameter
 2026-01-27 22:30:17 +01:00
Claire 5a45a3203a Merge commit '7af5ba271d6f04831f000e9b815914375e42abeb' into glitch-soc/merge-upstream 2026-01-27 18:03:27 +01:00
Matt Jankowski aa347708f5 Convert oauth/authorized_applications spec controller->request (#37614) 2026-01-27 10:44:24 +00:00
Matt Jankowski 604bed2930 Convert oauth/authorizations spec controller->request (#37613) 2026-01-27 10:20:25 +00:00
Claire 8b95254883 Merge commit 'c36db57acedf0033c090748125c665a0360cd11f' into glitch-soc/merge-upstream 2026-01-23 17:57:20 +01:00
David Roetzel c5c70311d8 Return empty array when requesting collections of an account that blocked you (#37591) 2026-01-23 13:11:57 +00:00
David Roetzel de63b61943 Change Collections API shape (#37580) 2026-01-23 10:22:37 +00:00
Matt Jankowski 157d8c0d99 Remove deprecated usage of imagemagick (#37488) 2026-01-22 14:57:19 +00:00
Matt Jankowski 7b9479239a Typo fix in federation document (#37564) 2026-01-22 13:59:36 +00:00
Claire 95aaefe083 Merge commit '562ea656f495f0619e393b7d93bd07c5abd28e5a' into glitch-soc/merge-upstream 2026-01-21 22:04:02 +01:00
David Roetzel 783504f36a Do not return undiscoverable collections (#37560) 2026-01-21 12:30:07 +00:00
Claire 5d04c56c48 Merge commit '400c1f3e8ec0ffd33ad30d9334b9210cdb89b14c' into glitch-soc/merge-upstream 2026-01-20 16:14:14 +01:00
Claire c2f776b747 Merge commit from fork 2026-01-20 15:10:38 +01:00
David Roetzel 7cdc05b9a8 Add language attribute to collections (#37549) 2026-01-20 13:22:54 +00:00
David Roetzel 51224bb437 Add "featured collections" collection to actors (#37512) 2026-01-20 08:27:05 +00:00
Claire ba45eb8764 Merge commit 'bc2f8a358f96a9540e6f39bb1c58273deb4545de' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream changed how theming works, and in particular changed the set of HTML attributes.
  Adapted upstream's change.
 2026-01-15 18:02:35 +01:00
diondiondion bc2f8a358f Enable theming via new HTML element attributes (#37477) 2026-01-15 16:04:27 +00:00
Claire f65e6a5029 Merge commit '10de65e41c3b01bd938f97fdb60fc96c26673966' into glitch-soc/merge-upstream 2026-01-14 20:31:42 +01:00
David Roetzel c218849204 Add collection endpoint (#37468) 2026-01-14 10:08:29 +00:00
Claire b4ed1e6c99 Merge commit '19bc3e76ea1d7fa2d9af711613a77fc0f5f0d1b5' into glitch-soc/main 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream added a helper to insert javascript tags, close to where we had
  modified code.
  Ported upstream's change.
 2026-01-13 18:30:48 +01:00
Matt Jankowski 19bc3e76ea Add spec for quote policy update change (#37474) 2026-01-13 16:21:55 +00:00
Claire 5b54cd7f76 Add ability to include inline javascript (#37459) 2026-01-13 10:40:26 +00:00
Claire aa6ec435d2 Merge commit '9fe14a30724e18425aedaba59ca63c63d8b14083' into glitch-soc/merge-upstream 2026-01-07 14:53:51 +01:00
Claire 0f79e29188 Merge commit from fork 2026-01-07 14:15:14 +01:00
Claire b1d219afd0 Merge commit '82fb2596c70a18fc4a2d99ab51106180196bfe98' into glitch-soc/merge-upstream 2026-01-05 18:19:58 +01:00
Claire 82fb2596c7 Fix posts with edited out media attachments being returned in /api/v1/accounts/:id/statuses?only_media=true (#37363) 2026-01-05 15:06:20 +00:00
Claire b5bc301cbd Fix serialization of context pages (#37376) 2026-01-05 11:59:10 +00:00
Claire f711e222dc Fix quotes with CWs but no text not having fallback link (#37361) 2026-01-05 10:35:35 +00:00
Claire 2ebf6d60a6 Merge commit 'e89acc2302df49cbd7815b031e9c2939632bd204' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Conflict because of an extra dependency in glitch-soc.
  Updated upstream's dependencies as upstream did.
 2026-01-03 16:05:35 +01:00
Claire bc3f68b46a Fix date-related wrapstodon test failures (#37362) 2026-01-02 10:52:22 +00:00
Claire 84feffd6e6 Merge commit '009275e66b55729f754da7b4c814b37b67dc76dc' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream added a method right next to glitch-soc-only methods.
  Added upstream's method.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream changed a line right next to a glitch-soc addition.
  Changed the code as upstream did.
 2025-12-17 18:27:14 +01:00
David Roetzel 5e8b8f9c23 Extract interaction policy class (#37277) 2025-12-17 10:12:43 +00:00
Claire db62d70492 Change Wrapstodon switch from feature flag to admin setting (#37273) 2025-12-17 09:47:02 +00:00
Claire 780fefa700 Merge commit '53be8392eceea8c3a576478e209fe82c2ceb458a' into glitch-soc/merge-upstream 2025-12-16 18:27:03 +01:00
Matt Jankowski dbf8d77cbb Add spec for missing username value in create account API (#37057) 2025-12-16 15:43:04 +00:00
Claire 1fdb48c668 Merge commit 'cbe135210305c0ce4455130c4e75680e53ff1425' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/wrapstodon/show.html.haml`:
  Conflict caused by glitch-soc's theming system.
  Updated upstream changes.
 2025-12-15 20:22:20 +01:00
David Roetzel bb72ecd466 Add simple API to remove item from collection (#37225) 2025-12-15 08:03:49 +00:00
Claire 6503287c2d Merge commit '4af8e83c8a236265c46a1b984fa5dbd3a7c73dfe' into glitch-soc/merge-upstream 2025-12-12 17:45:26 +01:00
David Roetzel 3cc4b59b41 First draft of API to add items to a collection (#37222) 2025-12-12 13:09:55 +00:00
Claire 53617cef5a Merge commit 'd730f6b0c5cfb18894d1a9e34d0aa2556dda3c62' into glitch-soc/merge-upstream 2025-12-11 18:05:28 +01:00
Emelia Smith d730f6b0c5 Add spec for client_credentials being used with /api/v1/apps/verify_credentials (#37195) 2025-12-11 16:40:22 +00:00
Claire 315f5e5a31 Merge commit '9d81561bb2440c8fb9a75bd05277120aff346b1e' into glitch-soc/merge-upstream 2025-12-09 18:06:56 +01:00
Matt Jankowski e147947eb8 Add wrapstodon page spec (#37168) 2025-12-09 09:27:29 +00:00
Claire 05e45beb34 Merge commit '607449336da198ea9fe9c014220a5374a0ca1ae4' into glitch-soc/merge-upstream 2025-12-08 16:33:27 +01:00
David Roetzel 8625721805 Draft API to get all collections by an account (#37139) 2025-12-08 08:56:13 +00:00
Claire c8f365fd1d Merge commit '0dac31dfd588e4cd866f382ed001a9535f06234a' into glitch-soc/merge-upstream 2025-12-04 20:59:54 +01:00
Claire 34aa825e96 Merge commit 'b3b5bf26d14f809a562244642949826b6a91bade' into glitch-soc/merge-upstream 2025-12-04 20:16:21 +01:00
David Roetzel 75b9e9a8b0 Enable missing before actions in Collection API (#37122) 2025-12-04 15:35:47 +00:00