Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-27 04:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,171 Commits 74 Branches 58 Tags
31df462f5198696f5efe01ddbfa97ecee6de01ce
Commit Graph

451 Commits

Author SHA1 Message Date
Claire
d5b959a2ca Merge commit '75fca715e9ae8ad347edbaf6511a052f161a3de3' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some preferences to a new category, while glitch-soc had an
  extra preference there.
  Moved the extra preference like upstream did to the new category.
 2025-09-02 19:07:51 +02:00
Claire
75fca715e9 Change public self-quotes of private posts to be disallowed (#35975) 2025-09-02 15:48:37 +00:00
Claire
6abe6cdef5 Merge commit '40242fafee83cf9a6bcb2d0ac1e228827969402f' into glitch-soc/merge-upstream 2025-08-29 18:21:28 +02:00
Claire
4fa203e69e Rename unknown quote policy value to unsupported_policy (#35955) 2025-08-29 13:50:37 +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
Claire
11902d958f Merge commit 'ce1680e6f979889ebd5c775353f3b82a8b2698bb' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Upstream added a new helper for a setting, where glitch-soc had extra ones.
  Not a real conflict, added upstream's new helper without removing glitch-soc's ones.
 2025-08-09 23:02:43 +02:00
Echo
8ee4b3f906 Update Redux to handle quote posts (#35715) 2025-08-08 08:44:05 +00:00
Claire
e68de292b4 Merge commit 'a485f97d21c3fb7da927e8fd239b301a590ee9b8' into glitch-soc/merge-upstream 2025-08-07 18:16:54 +02:00
Matt Jankowski
a485f97d21 Replace EmailHelper module with normalizes via model concern (#35702) 2025-08-07 13:47:47 +00:00
Claire
dbab707d64 Merge commit '591df1f205c654381203b56d46498efc62370776' into glitch-soc/merge-upstream 2025-08-01 22:11:59 +02:00
Claire
572a0e128d Change quote verification to not bypass authorization flow for mentions (#35528) 2025-07-31 07:39:53 +00:00
Claire
e53421b548 Merge commit 'e5826777b6c06a32b97388657beaca1e5eccb421' into glitch-soc/merge-upstream 
Conflicts:
- `config/settings.yml`:
  Not a real conflict, upstream removed settings that are identical in glitch-soc
  but textually adjacent to glitch-soc-only settings.
  Removed what upstream removed.
 2025-07-30 20:05:45 +02:00
Matt Jankowski
7e6b134222 Extract User::Activity concern (#35581) 2025-07-30 11:19:11 +00:00
Matt Jankowski
6dc55a2f4e Extract User::Confirmation concern (#35582) 2025-07-30 10:33:57 +00:00
Eugen Rochko
8cf7a77808 Fix async refresh never being finished when status cannot be fetched (#35500) 2025-07-29 09:23:32 +00:00
Matt Jankowski
73f72ec8fe Use attribute for defining rate_limit boolean (#35555) 2025-07-28 08:08:31 +00:00
Claire
8649681c51 Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/activitypub/note_serializer.rb`:
  Conflict because upstream added context extensions where glitch-soc had its own.
  Added upstream's new context extension while keeping ours.
 2025-07-25 21:45:00 +02:00
Claire
5a88b7f683 Add experimental basic quote post authoring (#35355) 2025-07-25 12:35:24 +00:00
Claire
63af7ecb1f Merge commit '7d3ef27a8dc8fb281bae959b245d3db63aa82260' into glitch-soc/merge-upstream 2025-07-23 18:43:56 +02:00
Eugen Rochko
14a781fa24 Add button to load new replies in web UI (#35210) 2025-07-23 13:42:07 +00:00
Claire
eeffe580d8 Merge commit '74fc4dbacf5a9168074e91fc2d75309dc42ff1ed' into glitch-soc/merge-upstream 2025-07-15 18:19:32 +02:00
Matt Jankowski
0efb889a9c Extract constant for attribution domains limit in account (#35350) 2025-07-15 13:08:24 +00:00
Claire
1716f8da71 Merge commit '3b52dca4057560c58b260433722d91650fcd5040' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a `features` attribute where glitch-soc had extra ones.
  Added `features` like upstream did.
 2025-07-11 18:53:47 +02:00
Claire
88b0f3a172 Simplify DatabaseViewRecord.refresh (#35252) 2025-07-11 08:36:05 +00:00
Matt Jankowski
c442589593 Use ActiveModel::Attributes in FollowLimitable concern (#35327) 2025-07-10 07:40:56 +00: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
Emelia Smith
72f2f35bfb Implement Instance Moderation Notes (#31529) 2025-06-25 08:15:44 +00:00
Claire
93bdb16817 Merge commit '8ba1487f30685fff4555a7537d3e6c765c73a07c' into glitch-soc/merge-upstream 
Conflicts:
- `spec/models/concerns/account/interactions_spec.rb`:
  Conflict due to glitch-soc having modified specs ages ago.
  The covered code is the same as upstream, though.
  Took upstream's version of the specs.
- `spec/models/status_spec.rb`:
  Conflict because glitch-soc tests for an extra glitch-soc-specific
  method.
  Added upstream's changes while keeping the glitch-soc method.
 2025-06-24 22:43:43 +02:00
Matt Jankowski
b08ccaa5b3 Extract Account::Mappings concern from "interactions" (#35119) 2025-06-23 12:02:14 +00:00
Claire
564d74ea36 Merge commit 'd887790e86124493df850e9bc52e1e059207b523' into glitch-soc/merge-upstream 2025-06-06 18:16:52 +02:00
Matt Jankowski
d887790e86 Update SafeReblogInsert concern to match Rails 8 method (#34966) 2025-06-06 15:25:09 +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
Matt Jankowski
1297ad759e Update rubocop to version 1.76.0 (#34926) 2025-06-05 12:09:05 +00:00
Claire
b031f65670 Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream 2025-05-25 14:51:59 +02:00
Matt Jankowski
4709121f72 Remove Legacy OTP Secret code (#34743) 2025-05-20 14:51:19 +00:00
Claire
c327451300 Merge commit 'a5a2c6dc7ec0d8af53594cd53a90da7d6fbefd5a' into glitch-soc/merge-upstream 2025-05-16 17:36:28 +02:00
David Roetzel
a5a2c6dc7e Add support for FASP data sharing (#34415) 2025-05-16 12:24:02 +00:00
Claire
5321a553d5 Merge commit 'aa04efb92a47cf27c1aafb2aeb21584e91c526ac' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Not a real conflict, upstream added a setting on a line adjacent to a
  glitch-soc-only line.
  Added upstream's new setting.
 2025-05-14 13:38:23 +02:00
Marcel Hellkamp
c9a554bdca fix: OIDC account creation fails for long display names (#34639) 2025-05-12 15:51:53 +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
8efc381063 Merge commit '04a9252a93fe18aa514957765a35e0abe2596864' into glitch-soc/merge-upstream 2025-03-29 19:19:58 +01:00
Claire
f8b0f38636 Merge commit '902aab1245a06319b7acd20045bd9ce051627300' into glitch-soc/merge-upstream 2025-03-29 17:02:39 +01:00
Claire
ee65f77a7e Add server-side support for grouping account sign-up notifications (#34298) 2025-03-28 12:35:25 +00:00
David Roetzel
97b9994743 Basic FASP support (#34031) 2025-03-28 12:16:40 +00:00
Claire
b330cc21c4 Merge commit 'aff51823752b809c3349698b6be02bfdda7a9010' into glitch-soc/merge-upstream 2025-03-12 19:48:51 +01:00
Claire
9db26db495 Refactor reply-fetching code and disable it by default (#34147) 2025-03-12 10:28:06 +00:00
Jonny Saunders
46e13dd81c Add Fetch All Replies Part 1: Backend (#32615) 
Signed-off-by: sneakers-the-rat <sneakers-the-rat@protonmail.com>
Co-authored-by: jonny <j@nny.fyi>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Kouhai <66407198+kouhaidev@users.noreply.github.com>
 2025-03-12 09:03:01 +00:00
Claire
b6f3cfb302 Merge commit 'e5655a5f65eb8116640ae434125553e0fe77f35e' into glitch-soc/merge-upstream 2025-03-06 20:10:00 +01:00