Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00
Code Issues Packages Projects Releases Wiki Activity
28,373 Commits 75 Branches 73 Tags
2e47579bd2be8a525410dd0d0f3e8e1bd02909db
Commit Graph

2401 Commits

Author SHA1 Message Date
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
Claire
e3cb4dea42 Merge commit '4d2a148ccbedc818c98fd712a0b44869c1019321' into glitch-soc/merge-upstream 2026-02-25 19:11:22 +01:00
David Roetzel
f9326efef6 Add moderation consequences for collections (#37974) 2026-02-25 14:32:07 +00:00
Claire
3508c8b2f6 Merge commit 'ef6405ab28e02686c0c9aa69d77eb43909be5f6f' into glitch-soc/merge-upstream 2026-02-23 18:20:47 +01:00
David Roetzel
e2aecd040c Collapse posts/collections in moderation interface (#37929) 2026-02-23 15:14:24 +00:00
Claire
eebed16f59 Merge commit '8e7c3973dc67835e0ce9c7073b9344ec19d3910a' into glitch-soc/merge-upstream 2026-02-19 21:52:23 +01:00
David Roetzel
e288bf6516 Show reported collections in moderation interface (#37898) 2026-02-19 12:46:38 +00:00
Claire
5f72148834 Merge commit '56ecdde1523cec87c55d3d0e7e9b6757dcfe2491' into glitch-soc/merge-upstream 2026-02-13 18:26:08 +01:00
Matt Jankowski
56ecdde152 Add ContentPoliciesHelper#policy_list to wrap string building in views (#37856) 2026-02-13 15:54:41 +00:00
Claire
e451416d90 Merge commit 'c44cc1f5c3bafb49a324f8f72a42a91d09eecfe3' into glitch-soc/merge-upstream 2026-02-12 18:00:45 +01:00
Matt Jankowski
db64ae368f Use implicit class_names in 2FA partials (#37846) 2026-02-12 15:19:43 +00:00
Claire
2373c5a132 Merge commit 'ca9966ce2ff79dcac90b2feced65fa991534d53e' into glitch-soc/merge-upstream 2026-02-11 20:26:56 +01:00
Claire
dfe44bcaef Add ability to require 2FA for specific roles (including Everybody) (#37701) 2026-02-11 14:34:09 +00:00
Claire
2f8ecb894e Fix generation of static error pages in glitch-soc 2026-02-11 14:12:46 +01:00
Claire
4fbd1ad7ae Merge commit 'd13d7b4566d551d027830f7dfc987ba3a8e2dd4f' into glitch-soc/merge-upstream 
Conflicts are too numerous to list, but they are all caused by upstream's
theming changes and all have to do with the differences between upstream and
glitch-soc in the theming systems.

They were all manually resolved by adapting the relevant code.
 2026-02-11 13:32:18 +01:00
Claire
75ba314e6b Migrate to new theming infrastructure (#37612) 2026-02-10 10:59:47 +00:00
Claire
3bbc8ecf92 Merge commit '8ebe2e673e2fd175140df7275eb362c8eecfec31' into glitch-soc/merge-upstream 2026-02-04 19:23:24 +01:00
Valtteri Laitinen
ee631bf826 Make “Following” correctly translatable (#37671) 2026-02-04 10:56:33 +00:00
Claire
d62a7775b5 Merge commit 'd0502ac3c1630e281fda5492cbc28390262b0aeb' into glitch-soc/merge-upstream 2026-01-29 21:08:46 +01:00
Matt Jankowski
d0502ac3c1 Use "namespace style" for URL generation in admin/ area forms (#35080) 2026-01-29 15:56:10 +00:00
Claire
32993fbdef Merge commit 'a6883242e3d9f9ed85806b66d40e1a148972bc3c' into glitch-soc/merge-upstream 2026-01-28 19:54:41 +01:00
Matt Jankowski
14ca5d0e6b Use collection partial for rule translation in signup flow (#35932) 2026-01-28 14:05:02 +00:00
Claire
b96c8ecff4 Merge commit '89c1b9a8fdfe38881ad1b6c22f20240b087aa993' into glitch-soc/merge-upstream 2026-01-26 18:09:54 +01:00
Matt Jankowski
24fb3e8465 Use collection render on admin dashboard system checks (#35976) 2026-01-26 09:43:30 +00:00
Matt Jankowski
876ccfe0a3 Use Report#local? delegation more broadly (#37596) 2026-01-26 09:43:21 +00:00
Essem
564b8720e1 Re-add data-user-flavour attribute (#3356) 
* Re-add `data-user-flavour` attribute

* Add data-user-flavour to embed/error pages

* Use actual flavor for embeds/error pages
 2026-01-19 20:07:47 +01:00
Claire
7839c8d9af Merge commit 'cc3c7ba532f75617505bb41297651a5c14f71bdd' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream simplified `theme_style_tags`. Our version is different because of
  the different theming system.
  Adapted upstream's changes.
- `app/views/layouts/error.html.haml`:
  Theming system.
 2026-01-16 23:22:19 +01:00
Claire
b6b6e142ba Merge commit '918563704f5ff5eeb1efa31a412ac38f97781e9e' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream modified `theme_color_tags` to work on color scheme rather than theme.
  Updated it as well.
- `app/views/layouts/embedded.html.haml`:
  Upstream changed the embed theme from `mastodon-light` to `system`.
  Glitch-soc doesn't use a hardcoded value, so ignore the change.
- `spec/helpers/theme_helper_spec.rb`:
  Accomodate `theme_color_tags` changes.
 2026-01-16 22:28:08 +01:00
Claire
5727b866b1 Fix error pages not using the new theming infrastructure (#37524) 2026-01-16 14:44:58 +00:00