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
28816 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire 841dfce9f7 Merge commit from fork 2026-01-20 15:13:43 +01:00
Claire 7a0d3d3bf8 Merge commit from fork 2026-01-20 15:13:10 +01:00
Claire c2f776b747 Merge commit from fork 2026-01-20 15:10:38 +01:00
David Roetzel 7cdc05b9a8 Add language attribute to collections (#37549) 2026-01-20 13:22:54 +00:00
Echo a1c17fef3a Profile redesign: Account name (#37527) 2026-01-20 11:10:46 +00:00
diondiondion fa9b905fdf Improve apiRequest helper types (#37544) 2026-01-20 11:04:06 +00:00
github-actions[bot]andGitHub Actions 8ff7662918 New Crowdin Translations (automated) (#37545) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-20 08:31:49 +00:00
David Roetzel 51224bb437 Add "featured collections" collection to actors (#37512) 2026-01-20 08:27:05 +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 5efebe716e Merge pull request #3351 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to ad77ee7f8b
 2026-01-19 19:17:27 +01:00
Claire e9793971b3 Merge commit 'ad77ee7f8ba6aa25ee36e3e21c38d9bbc252b097' into glitch-soc/merge-upstream 2026-01-19 18:01:57 +01:00
Matt Jankowski ad77ee7f8b Add coverage for misc "policy" classes (#37525) 2026-01-19 15:53:52 +00:00
Claire 220115757d Fix potential duplicate handling of quote accept/reject/delete (#37537) 2026-01-19 13:47:27 +00:00
Claire 9b6500f74a Skip tombstone creation on deleting from 404 (#37533) 2026-01-19 10:36:58 +00:00
github-actions[bot]andGitHub Actions e4c6130f77 New Crowdin Translations (automated) (#37532) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-19 09:40:47 +00:00
renovate[bot] fd78aa9eab Update dependency haml_lint to v0.69.0 (#37531) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-19 09:23:01 +00:00
renovate[bot] 4339f0ea71 Update dependency ioredis to v5.9.2 (#37510) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-19 09:22:42 +00:00
renovate[bot] f05e76e591 Update dependency postcss-preset-env to v11.1.1 (#37508) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-19 09:22:35 +00:00
Claire 9fd005042b Merge pull request #3350 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to cc3c7ba532
 2026-01-17 16:11:06 +01:00
Claire 605e62288c Fix tests 
Vite correctly detects the three themes are the same, and picks the first one, which
is `contrast` due to how glitch-soc's theming system works.
 2026-01-16 23:54:33 +01:00
Echo 40d5c00c3a [Glitch] Profile fields redesign 
Port 047338e684 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-16 23:54:33 +01:00
Claire d5fb44da91 [Glitch] Fix error pages not using the new theming infrastructure 
Port 5727b866b1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-16 23:54:33 +01:00
diondiondion 4c7bfca967 [Glitch] Add high-contrast styles to common stylesheet 
Port e715bb5075 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-16 23:24:50 +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 2c421cfd9e Merge pull request #3349 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 918563704f
 2026-01-16 23:19:23 +01:00
Heath Dutton🕴️ edf50bd073 [Glitch] Fix directory showing load more button when no more profiles exist 
Port 93f5ed0fce to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-16 22:31:54 +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 cc3c7ba532 Fix system theme being included twice (#37526) 2026-01-16 15:55:16 +00:00
renovate[bot] e21cb9f0d0 Update dependency pg to v8.17.1 (#37494) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-16 15:43:36 +00:00
Claire 5727b866b1 Fix error pages not using the new theming infrastructure (#37524) 2026-01-16 14:44:58 +00:00
renovate[bot] a9bdf5eef9 Update dependency pg-connection-string to v2.10.0 (#37495) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-16 14:35:51 +00:00
renovate[bot] 5b5b00055e Update dependency pino to v10.2.0 (#37507) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-16 14:35:42 +00:00
diondiondion e715bb5075 Add high-contrast styles to common stylesheet (#37523) 2026-01-16 13:57:48 +00:00
Echo 047338e684 Profile fields redesign (#37513) 2026-01-16 12:44:49 +00:00
Claire 918563704f Update the “embedded” styling to the new theme infrastructure (#37520) 2026-01-16 10:28:50 +00:00
Claire e58084a85f Update theme_color_tags helper for new theme infrastructure (#37519) 2026-01-16 10:00:04 +00:00
David Roetzel be00db4fa3 Use snowflake ids for collections and their items (#37514) 2026-01-16 09:49:53 +00:00
github-actions[bot]andGitHub Actions 0d9fcb59a4 New Crowdin Translations (automated) (#37517) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-16 09:17:56 +00:00
Claire 8a6389d3f7 Merge pull request #3348 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to bc2f8a358f
 2026-01-15 23:04:28 +01:00
Echo d748ed0434 [Glitch] Account header split up 
Port f2fb232e37 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-15 19:14:19 +01:00
diondiondion 73d29e16b5 [Glitch] Enable theming via new HTML element attributes 
Port bc2f8a358f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-15 18:08:37 +01:00
Echo 4694013f86 [Glitch] MiniCard and MiniCardList components 
Port c09fbeb32f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-15 18:07:28 +01:00
Claire ba45eb8764 Merge commit 'bc2f8a358f96a9540e6f39bb1c58273deb4545de' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream changed how theming works, and in particular changed the set of HTML attributes.
  Adapted upstream's change.
 2026-01-15 18:02:35 +01:00
Heath Dutton🕴️ 93f5ed0fce Fix directory showing load more button when no more profiles exist (#37465) 2026-01-15 17:02:17 +00:00
diondiondion bc2f8a358f Enable theming via new HTML element attributes (#37477) 2026-01-15 16:04:27 +00:00
Echo c09fbeb32f MiniCard and MiniCardList components (#37479) 2026-01-15 13:53:42 +00:00
Echo f2fb232e37 Account header split up (#37490) 2026-01-15 13:45:30 +00:00
Claire 2a6c084aa1 Update SECURITY.md (#37506) 2026-01-15 13:17:41 +00:00
github-actions[bot]andGitHub Actions 47557f5b9e New Crowdin Translations (automated) (#37492) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-15 10:41:11 +00:00
renovate[bot] 1482a7bf20 Update dependency postcss-preset-env to v11 (#37485) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-15 10:14:00 +00:00