tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,579 Commits 5 Branches 0 Tags
b96c8ecff426a1f24a322e9cd6a66ec553915418
Commit Graph
10097 Commits
Author SHA1 Message Date
Claire b96c8ecff4 Merge commit '89c1b9a8fdfe38881ad1b6c22f20240b087aa993' into glitch-soc/merge-upstream 2026-01-26 18:09:54 +01:00
github-actions[bot]andGitHub Actions e317645ed9 New Crowdin Translations (automated) (#37598) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-26 10:10:31 +00:00
Michael Stanclift 7022572011 Change 'anyone can quote' label to 'quotes allowed' (#37427) 2026-01-26 08:50:35 +00:00
Echo 0dbbd376c5 [Glitch] Re-download Material Icons 
Port 42b2fdb0ac to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-23 18:10:21 +01:00
Echo aa71913356 [Glitch] Callout component 
Port c1414f1161 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-23 18:10:21 +01:00
diondiondion 46c83fc91d [Glitch] Add "My collections" page 
Port a1acf8f4bc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-23 18:10:20 +01:00
Echo 20629b6188 [Glitch] Toggle component 
Port 0a0e253614 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-23 18:10:20 +01:00
diondiondion d8c086e6fd [Glitch] Add form field components: TextInputField, TextAreaField, SelectField 
Port 0924171c0f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-23 18:10:20 +01:00
Claire 8b95254883 Merge commit 'c36db57acedf0033c090748125c665a0360cd11f' into glitch-soc/merge-upstream 2026-01-23 17:57:20 +01:00
Echo c1414f1161 Callout component (#37590) 2026-01-23 15:53:48 +00:00
diondiondion a1acf8f4bc Add "My collections" page (#37552) 2026-01-23 13:51:39 +00:00
Echo 0a0e253614 Toggle component (#37582) 2026-01-23 12:20:56 +00:00
github-actions[bot]andGitHub Actions e12f39aa04 New Crowdin Translations (automated) (#37584) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-23 09:19:24 +00:00
diondiondion 0924171c0f Add form field components: TextInputField, TextAreaField, SelectField (#37578) 2026-01-22 16:08:57 +00:00
github-actions[bot]andGitHub Actions 3a84b73d80 New Crowdin Translations (automated) (#37569) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-22 14:26:33 +00:00
Echo 42b2fdb0ac Re-download Material Icons (#37571) 2026-01-22 12:04:15 +00:00
Echo 8ec969d4c1 [Glitch] Profile redesign: verified badges 
Port e79d51ce19 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-21 22:21:12 +01:00
Echo da330fc8c4 [Glitch] Profile redesign: Badges 
Port 22ec368574 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-21 22:21:12 +01:00
Claire 95aaefe083 Merge commit '562ea656f495f0619e393b7d93bd07c5abd28e5a' into glitch-soc/merge-upstream 2026-01-21 22:04:02 +01:00
github-actions[bot]andGitHub Actions 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
Echo 0a1731b81c [Glitch] Profile redesign: Account name 
Port a1c17fef3a 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 fa9b905fdf 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
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
Claire e9793971b3 Merge commit 'ad77ee7f8ba6aa25ee36e3e21c38d9bbc252b097' into glitch-soc/merge-upstream 2026-01-19 18:01:57 +01: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
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
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 5727b866b1 Fix error pages not using the new theming infrastructure (#37524) 2026-01-16 14:44:58 +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
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
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
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
Claire f65e6a5029 Merge commit '10de65e41c3b01bd938f97fdb60fc96c26673966' into glitch-soc/merge-upstream 2026-01-14 20:31:42 +01:00