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
David Roetzel
9921fa1af7
First draft API to delete collections ( #37117 )
2025-12-04 13:47:23 +00:00
David Roetzel
5a7a4fff11
First draft of Collection update API ( #37110 )
2025-12-04 10:00:21 +00:00
Claire
f8422e1fa4
Add API for on-demand generation of annual reports ( #37055 )
2025-12-02 13:37:05 +00:00
David Roetzel
2d203ca72a
First draft of API to get a single collection ( #37053 )
2025-12-01 15:04:52 +00:00
Claire
99ff59b7b2
Merge commit '37ccffa95a30772b55e3f18d486d699ee6c5f9e8' into glitch-soc/merge-upstream
2025-11-30 17:47:27 +01:00
David Roetzel
f896bbac3b
Draft API to create Collections ( #37049 )
2025-11-28 13:30:43 +00:00
Claire
b76530a7f1
Merge commit '76d8ac3fe680e92d20059c590ccb1cd8f74078c2' into glitch-soc/merge-upstream
2025-11-24 19:08:03 +01:00
David Roetzel
b16452dd99
Add shared context for API authentication ( #36981 )
2025-11-24 08:48:49 +00:00
Claire
7a56972381
Merge commit '366856f3bcdc2ff008b04e493a5de317ab83d5d0' into glitch-soc/merge-upstream
2025-11-19 21:49:09 +01:00
Matt Jankowski
53703202fb
Add IpBlock#to_cidr method to build string ( #35773 )
2025-11-17 14:51:05 +00:00
Matt Jankowski
59fdff5dc5
Add spec for translation attempt with ineligible target language ( #36813 )
2025-11-17 14:13:52 +00:00
Claire
d31aaf9ed8
Merge commit '1c3e7545cb6137025a6efd208d195352c54ffda8' into glitch-soc/merge-upstream
2025-11-10 22:18:01 +01:00
Matt Jankowski
1c3e7545cb
Add spec for translation attempt on private status ( #36810 )
2025-11-10 16:05:20 +00:00
Matt Jankowski
63e2ca5d27
Add spec for hitting max status pins limit in pin api ( #36789 )
2025-11-10 10:06:47 +00:00
Claire
c1ef6e31cb
Merge commit '441eb895371cf8ed6a5b8e294367bbbfd0f4c037' into glitch-soc/merge-upstream
2025-11-08 10:44:43 +01:00
Claire
70d71c10c8
Fix /api/v1/statuses/:id/context sometimes returing Mastodon-Async-Refresh without result_count ( #36779 )
2025-11-07 10:02:25 +00:00
Claire
8d1208224f
Merge commit 'd1f57822af0da2b2836e33baab5f89469ac6fa25' into glitch-soc/merge-upstream
2025-11-03 21:04:45 +01:00
Claire
9b3e92bf17
Prevent creation of Private Mentions quoting someone who is not mentioned ( #36689 )
2025-11-03 14:16:25 +00:00
Claire
48ec31bec8
Merge commit '4896d2c4c6d3bd6b878c5a075b6611c65d4203b2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream changed stuff too close to glitch-soc's theming system changes.
Applied upstream's changes.
- `streaming/index.js`:
Upstream refactored a bunch of stuff where our code was different due to
local-only posts.
Applied upstream's changes while taking care of local-only posts.
2025-10-28 22:10:12 +01:00
Claire
4b42fe6aba
Change API behavior of reblogs wrt. quotes for consistency ( #36559 )
2025-10-28 08:05:23 +00:00
Claire
5674100f0b
Merge commit '118ff13bd028cfb19370a12edb9307ea96007ad7' into glitch-soc/merge-upstream
2025-10-21 15:57:43 +02:00
Matt Jankowski
2eccd7b53c
Specs for validation error in API responses ( #36507 )
2025-10-21 07:33:30 +00:00
Claire
73a625c284
Merge commit '4dc21d7afdb485402555908bc72d071f8b25ec36' into glitch-soc/merge-upstream
...
Conflicts:
- `config/settings.yml`:
Upstream replaced a setting with 4 new ones, while glitch-soc had modified
the default value of that setting.
Removed the old setting and added the new settings, but with defaults
matching glitch-soc's previous behavior.
2025-10-06 19:24:16 +02:00
Claire
2d2c525097
Split timeline_preview setting into more granular settings ( #36338 )
2025-10-06 08:34:05 +00:00
Claire
17e0c745c6
Merge commit 'f69ca085dbfca2253404574dcdc4dc6c2aaa35c0' into glitch-soc/merge-upstream
2025-10-01 19:13:18 +02:00
Claire
cbb94bdfde
Merge commit '45219dbf64805746a472e50bb7c9bcb52972ab2a' into glitch-soc/merge-upstream
2025-09-30 18:06:45 +02:00
Claire
589af7a1cc
Change GET /api/v1/statuses/:id/quotes to allow listing quotes to other people's posts ( #36291 )
2025-09-30 09:56:03 +00:00
Claire
45219dbf64
Fix spurious notification of local boosters and quoters when updating quote policy ( #36299 )
2025-09-30 09:40:58 +00:00
Claire
b15b07606c
Merge commit '28be5a199f685b9fb26742c4d78ddca53df05d57' into glitch-soc/merge-upstream
2025-09-24 18:26:13 +02:00
Claire
e1f7847b64
Remove the outgoing_quotes feature flag, making the feature unconditional ( #36130 )
2025-09-24 08:58:08 +00:00
Claire
16e479e3ec
Merge commit '90765342a35abd6883e57f5419342f491b83e250' into glitch-soc/merge-upstream
2025-09-17 21:46:08 +02:00
Claire
90765342a3
Fix posts when omitting quote policy and default policy is nobody ( #36158 )
2025-09-17 19:16:36 +00:00
Claire
3a31ef11cc
Merge commit 'db0cd9489c70e985da961a585f3a809ca449dccf' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/post_status_service.rb`:
Upstream updated the logic to move the CW to the text content.
Glitch-soc does not move CW to text content but has some logic
to avoid the text being empty. Update the logic according to upstream's
change.
- `docker-compose.yml`:
Conflict because of different paths for composer images.
Updated version as upstream did while keeping our path.
2025-09-17 20:10:28 +02:00
Claire
210786efd8
Merge commit '2664bb628b7bf77b9efa4143423486cf16d17ba7' into glitch-soc/merge-upstream
2025-09-17 18:17:18 +02:00
Claire
fbf093a87f
Fix CW being moved to text when posting quote posts with empty text ( #36151 )
2025-09-17 12:19:00 +00:00
Jeong Arm
3055afd1d2
Fix applying user's default quote policy if API parameter is not specified ( #36132 )
2025-09-17 07:08:55 +00:00
Claire
6fc9febb47
Merge commit '1b664cf20dbb696cf16a42efcf59ab186cb211eb' into glitch-soc/merge-upstream
2025-09-05 20:03:42 +02:00
Matt Jankowski
05a655f33e
Convert age verification controller to system specs ( #36026 )
2025-09-05 12:44:09 +00:00
Claire
6abe6cdef5
Merge commit '40242fafee83cf9a6bcb2d0ac1e228827969402f' into glitch-soc/merge-upstream
2025-08-29 18:21:28 +02:00
Matt Jankowski
5f1e6a5886
Fix failure to verify changes in api/v1/accounts/credentials spec ( #35951 )
2025-08-29 08:14:23 +00:00
Claire
8d602df786
Merge commit '72bd1ed4b3df9188a1ad3e664c86fe2e928bd134' into glitch-soc/merge-upstream
2025-08-18 13:44:06 +02:00
Claire
72bd1ed4b3
Fix updates to quote policy not being federated ( #35804 )
2025-08-18 08:34:45 +00:00
Matt Jankowski
9d15b85d3b
Include update in the resources args for api/web/push_subscriptions route ( #35801 )
2025-08-18 07:35:56 +00:00
Claire
4d9150735a
Merge commit '651e51a82eba542c4d8c3fec5edd16420ea1ff3e' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Upstream updated a dependency textually adjacent to a glitch-soc-specific one.
Updated the dependency as upstream did.
2025-08-17 20:52:34 +02:00
Claire
a2cddb9eac
Disallow making private posts quotable ( #35780 )
2025-08-14 13:58:25 +00:00
