tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,496 Commits 5 Branches 0 Tags
Commit Graph

27496 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Echo
40d5c00c3a [Glitch] Profile fields redesign 
Port 047338e684a3b8fb89080b3ecbbd2f7c831e9c16 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 5727b866b14d29d696f2ef20e92ad4c22ff43c1d 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 e715bb50758687ade8cb574f4eebd6ad3918fc7e 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 918563704f5ff5eeb1efa31a412ac38f97781e9e
 2026-01-16 23:19:23 +01:00
Heath Dutton🕴️
edf50bd073 [Glitch] Fix directory showing load more button when no more profiles exist 
Port 93f5ed0fcecee13a59c2ca9e59c40b60574c0d4d 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]
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 bc2f8a358f96a9540e6f39bb1c58273deb4545de
 2026-01-15 23:04:28 +01:00
Echo
d748ed0434 [Glitch] Account header split up 
Port f2fb232e37d382308c4afa69fb189585306ec4c4 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 bc2f8a358f96a9540e6f39bb1c58273deb4545de 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 c09fbeb32fddad4ba131a438fa730cdf7cb5ed41 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]
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
renovate[bot]
dd52e61c24
Update opentelemetry-ruby (non-major) (#37480) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-15 10:13:56 +00:00
renovate[bot]
8eff59b106
Update dependency httplog to '~> 1.8.0' (#37484) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-15 10:13:53 +00:00
Claire
fd510421c4
Merge pull request #3347 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 10de65e41c3b01bd938f97fdb60fc96c26673966
 2026-01-15 00:06:11 +01:00
Claire
f65e6a5029 Merge commit '10de65e41c3b01bd938f97fdb60fc96c26673966' into glitch-soc/merge-upstream 2026-01-14 20:31:42 +01:00
Claire
10de65e41c
Fix FeedManager#filter_from_home error when handling a reblog of a deleted status (#37486) 2026-01-14 10:51:23 +00:00
renovate[bot]
4bdc9d5e1e
Update dependency vite to v7.3.1 (#37248) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-14 10:37:43 +00:00
renovate[bot]
5d03d5d15c
Update dependency libvips to v8.18.0 (#37282) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-14 10:37:05 +00:00
renovate[bot]
6fdef1191a
Update dependency globals to v17 (#37360) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-14 10:35:40 +00:00
renovate[bot]
d612119b3e
Update dependency thor to v1.5.0 (#37406) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-14 10:17:40 +00:00
renovate[bot]
8390f0dbbf
Update dependency rqrcode to v3.2.0 (#37431) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-14 10:10:52 +00:00
David Roetzel
c218849204
Add collection endpoint (#37468) 2026-01-14 10:08:29 +00:00
github-actions[bot]
2f91d9755d
New Crowdin Translations (automated) (#37482) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-14 10:02:11 +00:00
renovate[bot]
ccf3ed0ddf
Update Node.js to 24.13 (#37473) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-14 10:02:07 +00:00
Claire
46df08b3a4
Merge pull request #3346 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 19bc3e76ea1d7fa2d9af711613a77fc0f5f0d1b5
 2026-01-13 20:16:29 +01:00
Echo
aa83f94ac1 [Glitch] Add feature flag detection for profile redesign 
Port 122b1592ed543838f2047ef82e570ca58a087b32 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-13 18:35:37 +01:00
diondiondion
beb23500b1 [Glitch] Fix isDarkMode utility 
Port 41639655ffaa9914632fe937c9583b901b36f5cc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-13 18:35:16 +01:00
Heath Dutton🕴️
e14af55640 [Glitch] Fix keyboard navigation in media modal after clicking image 
Port be60c4585ebdac0cc236fb597246922af3fb6ce8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-13 18:34:48 +01:00
Claire
b4ed1e6c99 Merge commit '19bc3e76ea1d7fa2d9af711613a77fc0f5f0d1b5' into glitch-soc/main 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream added a helper to insert javascript tags, close to where we had
  modified code.
  Ported upstream's change.
 2026-01-13 18:30:48 +01:00
Claire
7f98a6703e
Merge pull request #3345 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 9b5986b36e86d50d19b68b10788b3316012894c3
 2026-01-13 18:21:18 +01:00
Claire
e33a8d5bfb Merge commit '9b5986b36e86d50d19b68b10788b3316012894c3' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Upstream refactored a bit where we had an extra argument for markdown/HTML.
  Adapted upstream change.
 2026-01-13 18:01:53 +01:00