tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,648 Commits 5 Branches 0 Tags
013f281fc8dc579f9560fa6ebced4ef849d89697
Commit Graph
5138 Commits
Author SHA1 Message Date
Claire d62a7775b5 Merge commit 'd0502ac3c1630e281fda5492cbc28390262b0aeb' into glitch-soc/merge-upstream 2026-01-29 21:08:46 +01:00
diondiondion 6f53b0b634 Implement editing collection settings and deleting collections (#37658) 2026-01-29 11:01:40 +00:00
github-actions[bot]andGitHub Actions 21f8fc808e New Crowdin Translations (automated) (#37655) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-29 10:59:30 +00:00
diondiondion 2427e14446 Add initial collections editor page (#37643) 2026-01-29 09:06:49 +00:00
Echo 8a42689268 Prevent account note from appearing on your own profile (#37653) 2026-01-29 09:02:42 +00:00
Echo 9079a75574 Profile redesign: Featured tags (#37645) 2026-01-29 09:01:36 +00:00
Claire 32993fbdef Merge commit 'a6883242e3d9f9ed85806b66d40e1a148972bc3c' into glitch-soc/merge-upstream 2026-01-28 19:54:41 +01:00
Claire 36be9bbebf Merge commit 'a495a0cbfcf9f6111c0e598af0864de2b76e4111' into glitch-soc/merge-upstream 2026-01-28 19:29:10 +01:00
Claire 2e0caa2b73 Merge commit '1ae6b52c471d82d3682a732680549fd849c91957' into glitch-soc/merge-upstream 2026-01-28 19:05:27 +01:00
Claire a6883242e3 Remove unused nan locale files (replaced by nan-TW) (#37650) 2026-01-28 16:32:19 +00:00
github-actions[bot]andGitHub Actions 42dfd6c031 New Crowdin Translations (automated) (#37647) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-28 16:04:42 +00:00
PGray f1c00feb5c Fix quote cancel button not appearing after edit then delete-and-redraft (#37066) 2026-01-28 10:33:04 +00:00
Echo ec76288dff Profile redesign: Timeline filters (#37626) 2026-01-28 10:17:32 +00:00
Echo 3f46034039 Tags component (#37638) 2026-01-28 10:17:11 +00:00
github-actions[bot]andGitHub Actions 8ba87ef568 New Crowdin Translations (automated) (#37639) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-28 09:25:20 +00:00
Claire 5a45a3203a Merge commit '7af5ba271d6f04831f000e9b815914375e42abeb' into glitch-soc/merge-upstream 2026-01-27 18:03:27 +01:00
Echo 34f0482ad4 Profile redesign: Account notes (#37593) 2026-01-27 15:34:09 +00:00
Echo c0616bcab6 Profile redesign: Username update (#37627) 2026-01-27 15:03:52 +00:00
Echo 76ab866d93 Deprecate need for revert-layer CSS (#37632) 2026-01-27 14:45:35 +00:00
github-actions[bot]andGitHub Actions 6a73618f3d New Crowdin Translations (automated) (#37621) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-27 09:52:41 +00:00
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
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
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 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
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
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
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