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

27685 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
95aaefe083 Merge commit '562ea656f495f0619e393b7d93bd07c5abd28e5a' into glitch-soc/merge-upstream 2026-01-21 22:04:02 +01:00
Matt Jankowski
562ea656f4
Add coverage for TagManager#normalize_domain (#35994) 2026-01-21 16:11:38 +00:00
nicole mikołajczyk
3219373d56
Add profile field limits to instance serializer (#37535) 2026-01-21 16:01:33 +00:00
Echo
6897475f9b
Adds theming to Storybook (#37562) 2026-01-21 15:54:52 +00:00
renovate[bot]
22e438d7bd
Update dependency @csstools/stylelint-formatter-github to v2 (#37515) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-21 14:14:48 +00:00
github-actions[bot]
1468f94509
New Crowdin Translations (automated) (#37555) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-21 13:08:16 +00:00
Echo
e79d51ce19
Profile redesign: verified badges (#37538) 2026-01-21 13:08:08 +00:00
renovate[bot]
5d82d48af3
Update dependency stylelint-config-standard-scss to v17 (#37511) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-21 12:31:35 +00:00
renovate[bot]
24ffa00bca
Update dependency pino to v10.2.1 (#37543) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-21 12:31:19 +00:00
David Roetzel
783504f36a
Do not return undiscoverable collections (#37560) 2026-01-21 12:30:07 +00:00
Claire
e7c6600d83
Fix cross-server conversation tracking (#37559) 2026-01-21 12:02:41 +00:00
David Roetzel
e65103bd3d
Fix rendering of initial state when collections feature is enabled (#37556) 2026-01-21 09:18:16 +00:00
Claire
e612378f08
Merge pull request #3360 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 400c1f3e8ec0ffd33ad30d9334b9210cdb89b14c
 2026-01-20 16:35:37 +01:00
Echo
0a1731b81c [Glitch] Profile redesign: Account name 
Port a1c17fef3aa863fc18eaa0941fa32f15222f859c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-20 16:20:33 +01:00
diondiondion
b5060ba9c3 [Glitch] Improve apiRequest helper types 
Port fa9b905fdf110afc2e0e710283bea8e81c1161aa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-20 16:16:34 +01:00
Echo
22ec368574
Profile redesign: Badges (#37550) 2026-01-20 15:15:49 +00:00
Claire
5d04c56c48 Merge commit '400c1f3e8ec0ffd33ad30d9334b9210cdb89b14c' into glitch-soc/merge-upstream 2026-01-20 16:14:14 +01:00
Claire
400c1f3e8e
Bump version to v4.5.5 (#37551) 2026-01-20 15:00:10 +00:00
Claire
028e76f770
Merge commit from fork 
* Add limit on inbox payload size

The 1MB limit is consistent with the limit we use when fetching remote resources

* Add limit to number of options from federated polls

* Add a limit to the number of federated profile fields

* Add limit on federated username length

* Add hard limits for federated display name and account bio

* Add hard limits for `alsoKnownAs` and `attributionDomains`

* Add hard limit on federated custom emoji shortcode

* Highlight most destructive limits and expand on their reasoning
 2026-01-20 15:14:45 +01:00
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]
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 ad77ee7f8ba6aa25ee36e3e21c38d9bbc252b097
 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]
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 cc3c7ba532f75617505bb41297651a5c14f71bdd
 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 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