Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-24 19:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,540 Commits 74 Branches 58 Tags
c9a1e27a4973bf3ec7866f53bf9eb8f36ca86bd7
Commit Graph

2228 Commits

Author SHA1 Message Date
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
Claire
0a7418e6d8 Change rule translation interface to display english name and populate empty translations (#35170) 2025-06-25 10:02:19 +00:00
Emelia Smith
72f2f35bfb Implement Instance Moderation Notes (#31529) 2025-06-25 08:15:44 +00:00
Matt Jankowski
f852da50f6 Add User#email_domain method to extract domain from email address (#35159) 2025-06-25 07:22:19 +00:00
Claire
220b78d4a9 Merge commit '2254f47702368938bdfd0d997f2487fb2950d676' into glitch-soc/merge-upstream 2025-06-12 17:39:03 +02:00
Eugen Rochko
ccf7760205 Change viewport behaviour to cover (#34986) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2025-06-12 12:26:24 +00:00
Eugen Rochko
24d943fee0 Change media attachments in moderated posts to not be accessible (#34872) 2025-06-12 08:53:02 +00:00
Claire
aa6d1d4ac1 Merge commit '629bb74451242060298c6fb305c5337002379cc2' into glitch-soc/merge-upstream 2025-06-11 18:55:03 +02:00
Claire
e557769a3c Remove broken link to /start/share in welcome e-mail (#34962) 2025-06-08 13:58:53 +00:00
Claire
c00e27aa55 Merge commit '54ad57ea9527a58ac2b95159ed178ed7c737a89c' into glitch-soc/merge-upstream 2025-05-30 17:41:31 +02:00
Matt Jankowski
f7a3dd0e38 Use config_for for VAPID key storage (#34845) 2025-05-30 07:00:33 +00:00
Claire
706c8bf1a0 Merge commit 'a13756148d353c7479f68e65a210f6d88d26c785' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/embedded.html.haml`:
  Upstream made a change to javascript tags next to lines changed in glitch-soc
  because of the theming system.
  Added the javascript entrypoint upstream added.
- `app/views/layouts/error.html.haml`:
  Upstream made a change to javascript tags next to lines changed in glitch-soc
  because of the theming system.
  Added the javascript entrypoint upstream added.
 2025-05-25 15:11:58 +02:00
Claire
b031f65670 Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream 2025-05-25 14:51:59 +02:00
Claire
f622686397 Merge commit '90f7b90223ce3212a2bb9746a119bcc9287b3237' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream updated dependencies, including one textually adjacent to a
  glitch-soc-only dependency.
  Updated dependencies as upstream did.
 2025-05-25 14:38:25 +02:00
Claire
f49940db85 Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream 
Too many conflicts to list, because of webpack → vite migration.
 2025-05-25 14:36:51 +02:00
Renaud Chaput
ef1bf8e9f2 Fix polyfills naming and tag missing a source (#34768) 2025-05-22 12:54:47 +00:00
Renaud Chaput
83dd09d4dc Fix JS polyfills missing after the Vite switch (#34758) 2025-05-21 20:11:01 +00:00
Claire
8c51a8ba94 Add ability to translate server rules (#34494) 2025-05-21 11:54:12 +00:00
Claire
d7cb6068b1 Add ability to reorder server rules from admin interface (#34737) 2025-05-20 12:49:11 +00:00
Echo
dbf14784bf Add setting to control the referrer origin (#34731) 2025-05-19 13:13:22 +00:00
Claire
8cc5084ca1 Add interstitial for Terms of Service updates (#34527) 2025-05-16 14:03:05 +00:00
Echo
c4f47adb49 Convert from Webpack to Vite (#34450) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2025-05-16 13:26:12 +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
Claire
aa04efb92a Move server rule creation form to its own page (#34637) 2025-05-14 09:43:07 +00:00
Claire
5305e939c4 Add (currently unused) setting for default quote policy (#34623) 2025-05-13 11:47:38 +00:00
Claire
f993d7578b Use plural forms for date_of_birth prompt (#34636) 2025-05-13 11:29:22 +00:00
Claire
80f7175379 Merge commit 'a296facdea884cc828999c9f9be0f4bc83afe68d' into glitch-soc/merge-upstream 2025-04-11 19:14:53 +02:00
Claire
00cd218741 Add paragraph to tell admins that email announcements cannot be opted out (#34411) 2025-04-11 09:52:23 +00:00
Claire
f8b0f38636 Merge commit '902aab1245a06319b7acd20045bd9ce051627300' into glitch-soc/merge-upstream 2025-03-29 17:02:39 +01:00
David Roetzel
97b9994743 Basic FASP support (#34031) 2025-03-28 12:16:40 +00:00
Claire
9c5c86c947 Merge commit 'c93b2c6809905d24262b5973efe20832f1b04a6d' into glitch-soc/merge-upstream 2025-03-26 18:18:07 +01:00
Claire
c93b2c6809 Add new filter action to blur media (#34256) 2025-03-26 07:31:05 +00:00
Claire
971690caf2 Merge commit 'f7b1769e8a69e2831493f3a704d68efa5cf9beff' into glitch-soc/merge-upstream 2025-03-19 20:09:14 +01:00
Eugen Rochko
0099907600 Fix error when terms of service are missing an effective date (#34200) 2025-03-18 21:39:13 +00:00
Claire
0efa669fe9 Merge commit '2f98134ac69ee840095c9d8389e4b2fff72f20c1' into glitch-soc/merge-upstream 2025-03-15 17:49:32 +01:00
Eugen Rochko
d213c585ff Add age verification on sign-up (#34150) 2025-03-14 14:07:29 +00:00
Claire
4bea9a0a66 Merge commit '04492e7f934d07f8e89fa9c3d4fe3381f251e8a2' into glitch-soc/merge-upstream 2025-03-07 18:34:27 +01:00
Claire
dbd3e05812 Merge commit 'b57687083f4af178f2e2f43665eb4e49d32a50c2' into glitch-soc/merge-upstream 2025-03-07 17:37:36 +01:00
Eugen Rochko
2cabbae132 Add min. age to terms of service (#34105) 2025-03-07 11:50:52 +00:00
Claire
b6f3cfb302 Merge commit 'e5655a5f65eb8116640ae434125553e0fe77f35e' into glitch-soc/merge-upstream 2025-03-06 20:10:00 +01:00
Claire
5a100bf38f Add ability to email announcements to all users (#33928) 2025-03-06 14:05:27 +00:00
Eugen Rochko
cadda2f957 Add effective date to terms of service (#33993) 2025-03-05 09:01:33 +00:00
Darren VanBuren
bff53a637e Fix up the off by one error on displayed rank for trending tags admin page. (#34016) 2025-02-28 11:16:49 +00:00
Emelia Smith
febcd0a76c Expose status language via og:locale (#34012) 2025-02-28 10:53:39 +00:00
Claire
a682bd19f5 Merge commit '20531d1e078a27116dea53ce21c1b32bf3774eca' into glitch-soc/merge-upstream 2025-02-25 18:52:24 +01:00
Eugen Rochko
298ca53593 Add choice of law to terms of service generator (#33994) 2025-02-25 10:58:11 +00:00
Claire
c85616ee3a Merge commit 'f79b96a5ef0f6c4f57eee7f44ce2579b28a22098' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/feed_manager.rb`:
  Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
  Added upstream's code.
- `app/models/user_settings.rb`:
  Not a real conflict, glitch-soc has an extra setting textually-adjacent to a
  setting added upstream.
  Added upstream's setting.
- `app/serializers/initial_state_serializer.rb`:
  Same.
- `app/services/precompute_feed_service.rb`:
  Not a real conflict, glitch-soc has extra code for the direct feed.
  Added upstream's new code for populating lists.
 2025-02-01 19:07:13 +01:00
Eugen Rochko
1e70da5e3c Add reminder when about to post without alt text in web UI (#33760) 2025-01-29 11:37:56 +00:00
Claire
844ae90dad Merge commit '2beab34ca405a0beb3ea9f5ab684779dc2eb6374' into glitch-soc/merge-upstream 2025-01-29 12:05:09 +01:00
Eugen Rochko
6aa565b319 Fix missing button styles on some forms (#33771) 2025-01-29 10:36:24 +00:00