tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,816 Commits 5 Branches 0 Tags
83ea9b94de798a93ca06ea0629e4920e3421c4e5
Commit Graph
2429 Commits
Author SHA1 Message Date
Claire b3bae7e78f Merge commit '3473b8a65278783bc74ce2738aea98cca0c7a5ed' into glitch-soc/merge-upstream 
Conflicts:
- `config/settings.yml`:
  Upstream added a new setting textually adjacent to ones modified by glitch-soc's.
  Added upstream's new setting.
 2026-04-25 09:20:39 +02:00
diondiondion a217b633b7 Allow defining alt text for server thumbnail (#38796) 2026-04-23 17:46:50 +00:00
David Roetzel fdb2563abf Use /collections/:id as canonical URL for a collection (#38783) 2026-04-23 07:36:35 +00:00
Claire b6abf7a69f Merge commit 'c4eec632b92c800ae38dba111c4c76e63bb1c0de' into glitch-soc/merge-upstream 2026-04-22 20:24:21 +02:00
David Roetzel 1cae543e8f Add per-user maximum number of collections (#38769) 2026-04-22 12:34:08 +00:00
Claire 0b3c848958 Merge commit 'a706fce6781104b3aa1315be14f1fb8ccd4fcb1b' into glitch-soc/merge-upstream 2026-04-21 19:20:05 +02:00
Matt Jankowski c589530e22 Add constants to track media player height/width (#38755) 2026-04-21 11:10:45 +00:00
Claire e0a34e6d89 Merge commit 'b15d234ccb5d004180561c440dd45536d70e67b2' into glitch-soc/merge-upstream 2026-04-17 18:06:10 +02:00
Matt Jankowski ea33d7fba6 Add AccountMigration#remaining_cooldown_days method (#38561) 2026-04-17 14:01:07 +00:00
Matt Jankowski 1d3ca80bf7 Use model constants more consistently for view expiration collections (#38589) 2026-04-17 13:57:18 +00:00
Matt Jankowski 3411d06f9e Pull user settings defaults from configuration (#38592) 2026-04-17 08:31:37 +00:00
Claire b9014ec220 Merge commit '66fdd3ae65e13349fbc0b2818d4b91a389075553' into glitch-soc/main 2026-04-08 19:32:32 +02:00
Claire 69b70d48c6 Merge commit 'db13dddcf90343574dee320fff7e8bb9bf3707e4' into glitch-soc/merge-upstream 2026-04-07 20:08:57 +02:00
Echo e4e7e679b3 Profile editing: Removes old profile editing page (#38584) 2026-04-07 13:52:04 +00:00
Matt Jankowski 71e6e50846 Simplify media attachment lookup in show/player actions (#38565) 2026-04-07 09:58:37 +00:00
Claire da85a16692 Merge commit '8fa91b4b81951f884a773d0aa56fc4f1a48da03e' into glitch-soc/merge-upstream 2026-04-04 09:31:50 +02:00
Matt Jankowski 8fa91b4b81 Use partial to render settings/featured_tags (#36174) 2026-04-03 16:29:00 +00:00
Matt Jankowski ee69290003 Use collection partial for "software updates" list in admin area (#38550) 2026-04-03 13:28:50 +00:00
Claire cb62beca08 Merge commit 'dc923c6425559266f0665fe2e294f6e412783810' into glitch-soc/merge-upstream 2026-04-02 18:20:01 +02:00
Eugen Rochko 8a5d6dab5f Fix relative sign-up path in e-mail subscription notification (#38527) 2026-04-02 11:14:42 +00:00
Claire 7a4747122e Merge commit 'ca5c0a144ade4bff7bd10446a39d86116879884e' into glitch-soc/merge-upstream 
- `CODE_OF_CONDUCT.md`:
  Adopt upstream's new Code of Conduct
 2026-04-01 19:11:21 +02:00
Claire b5c1a13341 Merge commit '30275cd80e8552d6cbcdeb11f83a4d5028aa6eae' into glitch-soc/merge-upstream 2026-04-01 18:37:21 +02:00
Eugen Rochko 14544dc4dd Fix subject of email subscription notification e-mail being difficult to localize (#38507) 2026-04-01 08:32:47 +00:00
Matt Jankowski 77507d2c7c Add counting convenience methods on BulkImport (#38465) 2026-03-30 08:52:48 +00:00
Claire 2ac493ee8e Merge commit '9d5e10a70e006c1c0bc61e7f591b1078c7be6ab4' into glitch-soc/merge-upstream 2026-03-26 18:23:45 +01:00
Echo dd8602a928 Profile editing: Add notice in profile preferences (#38404) 2026-03-26 11:03:40 +00:00
Claire 79958d9442 Merge commit '31abef8917879917a330419fe3981a2fb7f35b69' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/post_status_service.rb`:
  Upstream added a line adjacent to one that had been modified due to local-only posting.
  Added upstream's change.
- `tsconfig.json`:
  Upstream updated Typescript and updated `tsconfig` in the process by changing paths, where
  glitch-soc had extra paths. Updated as upstream did.
 2026-03-25 21:36:32 +01:00
Eugen Rochko bcf0718a9a Add email subscriptions (#38163) 2026-03-25 16:25:45 +00:00
Claire fac3080289 Merge commit 'cffa8de6267a57673b7f6264fab671153f965d23' into glitch-soc/merge-upstream 2026-03-19 12:38:31 +01:00
diondiondion 43d66959aa Sign-up server rules: Show different icon on toggle button when description is expanded (#38293) 2026-03-19 10:58:59 +00:00
diondiondion ec940e88df Add missing h1 headings to Reset Password & Resend Confirmation Link pages (#38285) 2026-03-19 08:26:52 +00:00
Claire 842bac86f6 Merge commit 'db074fc3e2b671e28a44ae379e6df1fcbdbbce53' into glitch-soc/merge-upstream 2026-03-18 18:01:57 +01:00
diondiondion 380b898d0d Improve accessibility of server rules list in sign-up flow (#38257) 2026-03-18 16:08:23 +00:00
Claire 3593ddff11 Merge commit 'b320c9e4c901bf99ccbca321bad2ceb2f51de140' into glitch-soc/merge-upstream 2026-03-17 18:58:19 +01:00
Claire bd9e7d6060 Merge commit '68984de5b503791b814d81a85520af256bf43e11' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/settings/discovery/show.html.haml`:
  Glitch-soc has an extra setting textually adjacent to a line upstream has changed.
  Applied upstream's change while keeping glitch-soc's setting.
 2026-03-17 18:53:00 +01:00
diondiondion 75c4ff35d2 Improve accessibility of sign-up progress indicator (#38252) 2026-03-17 12:44:40 +00:00
diondiondion 68984de5b5 Revamp heading levels in settings & admin pages (#38230) 2026-03-17 10:32:24 +00:00
Claire 73f77c49d8 Merge commit '16c41e035bdd6e08927c950aeeb5332adbe8b6d5' into glitch-soc/merge-upstream 
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the Mastodon API version, glitch-soc has an extra glitch version.
  Bumped the Mastodon API version as upstream did.
 2026-03-16 18:16:56 +01:00
Matt Jankowski 1a464bc5ed Use to_json in simple view hash data-props build locations (#38218) 2026-03-16 14:02:52 +00:00
Claire 3afb58ad18 Merge commit '89b7a3d7fb73ba79d33cab9755424b4aa2050b1b' into glitch-soc/merge-upstream 2026-03-14 11:41:24 +01:00
diondiondion 89b7a3d7fb A11y improvements on login & settings pages (#38188) 2026-03-13 17:14:04 +00:00
Claire 4bcd0caa79 Merge commit 'e235c446c96280c015fb27f7eefe4e95a5a39892' into glitch-soc/merge-upstream 2026-03-09 12:41:12 +01:00
Matt Jankowski 3b1705a406 Add TermsOfService#usable_effective_date to DRY up view logic (#38095) 2026-03-09 09:38:00 +00:00
Claire 0a989af8c6 Merge commit '3d8d5f6dc7625d9638cc2e3387247442225d4e3f' into glitch-soc/merge-upstream 2026-03-05 18:21:07 +01:00
Matt Jankowski 6d9c16e4a1 Fix incorrect I18n string in webauthn mailers (#38062) 2026-03-05 10:37:12 +00:00
Claire d2f5feb25f Fix linting issue 2026-03-02 18:59:32 +01:00
Claire 1b92ac0729 Merge commit '74b3b6c798d1f137947e80df8eefb7412e70febd' into glitch-soc/merge-upstream 2026-03-02 18:11:45 +01:00
Matt Jankowski e7cec161fd Reduce haml-lint LineLength configuration to 240 (#37287) 2026-03-02 14:43:57 +00:00
Claire 799bd69189 Merge commit '2f657019201d73c9d86d1ece339e66e72954f0eb' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
  Upstream refactored a line adjacent to a glitch-soc modified line.
  Ported upstream changes.
 2026-03-02 12:19:02 +01:00
Matt Jankowski c86a8f8798 Use file_field support for array to accept attribute (#37844) 2026-03-02 09:27:04 +00:00