Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 11:11:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
28,264 Commits 75 Branches 73 Tags
3593ddff11ba5582d5668bc7607fbe82614a692e
Commit Graph

10426 Commits

Author SHA1 Message Date
Claire
3593ddff11 Merge commit 'b320c9e4c901bf99ccbca321bad2ceb2f51de140' into glitch-soc/merge-upstream 2026-03-17 18:58:19 +01:00
diondiondion
5b9cb55701 [Glitch] Revamp heading levels in settings & admin pages 
Port 68984de5b5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-17 18:55:35 +01:00
Claire
bd9e7d6060 Merge commit '68984de5b503791b814d81a85520af256bf43e11' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/settings/discovery/show.html.haml`:
  Glitch-soc has an extra setting textually adjacent to a line upstream has changed.
  Applied upstream's change while keeping glitch-soc's setting.
 2026-03-17 18:53:00 +01:00
Claire
04bf07a9cf Merge commit 'c37bc5a8a94758e19b2d50db5e7816a96cec5cf4' into glitch-soc/merge-upstream 2026-03-17 18:01:07 +01:00
Itoh Shimon
efa76ace8a Fix vertically written textareas (#38205) 2026-03-17 15:43:49 +00:00
diondiondion
75c4ff35d2 Improve accessibility of sign-up progress indicator (#38252) 2026-03-17 12:44:40 +00:00
diondiondion
68984de5b5 Revamp heading levels in settings & admin pages (#38230) 2026-03-17 10:32:24 +00:00
github-actions[bot]
75c5f30556 New Crowdin Translations (automated) (#38247) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-17 09:36:34 +00:00
Echo
938f53a624 [Glitch] Profile editing: Finish image editing 
Port 4328807f28 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-16 18:31:24 +01:00
Echo
59879b7a61 [Glitch] Profile editing: Uploading avatar and header images 
Port 21c27eb3af to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-16 18:30:43 +01:00
Claire
73f77c49d8 Merge commit '16c41e035bdd6e08927c950aeeb5332adbe8b6d5' into glitch-soc/merge-upstream 
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the Mastodon API version, glitch-soc has an extra glitch version.
  Bumped the Mastodon API version as upstream did.
 2026-03-16 18:16:56 +01:00
Echo
4328807f28 Profile editing: Finish image editing (#38235) 2026-03-16 15:56:30 +00:00
Echo
21c27eb3af Profile editing: Uploading avatar and header images (#38189) 2026-03-16 11:39:52 +00:00
Claire
4359098740 Merge commit '9c8be1e72146af247e2b6cdae6e1d37371506569' into glitch-soc/merge-upstream 2026-03-16 12:17:49 +01:00
github-actions[bot]
5b6b86c97c New Crowdin Translations (automated) (#38201) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-16 08:26:09 +00:00
diondiondion
39f1861252 [Glitch] A11y improvements on login & settings pages 
Port 89b7a3d7fb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-14 11:51:20 +01:00
Echo
334188b4fc [Glitch] Adds a range selector component 
Port d26269d68b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-14 11:49:27 +01:00
Echo
a78119d8d3 [Glitch] Fix incorrect SASS addition 
Port 91407ecc15 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-14 11:48:14 +01:00
diondiondion
8ec882df0c [Glitch] Allow displaying field status (error, warning, info) under form fields 
Port 890b2673fc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-14 11:43:31 +01:00
Claire
3afb58ad18 Merge commit '89b7a3d7fb73ba79d33cab9755424b4aa2050b1b' into glitch-soc/merge-upstream 2026-03-14 11:41:24 +01:00
diondiondion
89b7a3d7fb A11y improvements on login & settings pages (#38188) 2026-03-13 17:14:04 +00:00
Echo
d26269d68b Adds a range selector component (#38191) 2026-03-13 14:28:39 +00:00
Echo
91407ecc15 Fix incorrect SASS addition (#38194) 2026-03-13 14:21:39 +00:00
diondiondion
890b2673fc Allow displaying field status (error, warning, info) under form fields (#38175) 2026-03-13 13:55:17 +00:00
github-actions[bot]
3a2613a3e8 New Crowdin Translations (automated) (#38185) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-13 09:33:06 +00:00
Echo
a7974df51a [Glitch] Profile editing: Edit image menu 
Port 420136e83b to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-12 18:53:39 +01:00
diondiondion
ba7db10fd0 [Glitch] Fix extra border on accounts in settings page 
Port 13c94db9e7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-12 18:51:04 +01:00
Eugen Rochko
263615b74f [Glitch] Change order of onboarding steps 
Port 51894ac247 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-12 18:50:13 +01:00
Claire
3833eadfbf Merge commit 'adede83c7c9a943cf9954fe865becf6a0c2d2280' into glitch-soc/merge-upstream 2026-03-12 18:48:32 +01:00
Echo
adede83c7c Updates to latest Material Icons (#38171) 2026-03-12 11:17:43 +00:00
Echo
420136e83b Profile editing: Edit image menu (#38156) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2026-03-12 10:42:29 +00:00
diondiondion
13c94db9e7 Fix extra border on accounts in settings page (#38168) 2026-03-12 10:19:06 +00:00
github-actions[bot]
7f9df6d02d New Crowdin Translations (automated) (#38164) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-12 09:53:59 +00:00
Eugen Rochko
51894ac247 Change order of onboarding steps (#38121) 2026-03-11 21:07:31 +00:00
diondiondion
979ef236ca [Glitch] Collection editor: Format topic as hashtag 
Port 3ef7d2835a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-11 18:55:45 +01:00
Echo
99b43f225c [Glitch] Profile editing: Always show field buttons 
Port 4a08ab64d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-11 18:55:18 +01:00
diondiondion
18aefaea62 [Glitch] Refactor collection editor state handling 
Port 20932752fe to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-11 18:54:52 +01:00
Echo
006b06199f [Glitch] Profile editing: Add warning for links 
Port 12c6c6dcf9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-11 18:54:22 +01:00
Echo
3ed3ce4e05 [Glitch] Profile editing: Fix bug with reordering 
Port f971670c62 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-11 18:53:42 +01:00
Claire
0dddc44eb5 [Glitch] Add fallback to Object intent for FEP-3b86 in remote interaction helper 
Port 9916c786e6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-11 18:53:10 +01:00
diondiondion
a76ee2e233 [Glitch] Prevent hover card from showing unintentionally 
Port 316290ba9d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-11 18:52:39 +01:00
Claire
b5222606e3 Merge commit '811575a10903cada549580979cc809ca98ad570c' into glitch-soc/merge-upstream 2026-03-11 18:50:59 +01:00
diondiondion
3ef7d2835a Collection editor: Format topic as hashtag (#38153) 2026-03-11 17:04:37 +00:00
Echo
4a08ab64d1 Profile editing: Always show field buttons (#38152) 2026-03-11 13:52:44 +00:00
diondiondion
20932752fe Refactor collection editor state handling (#38133) 2026-03-11 13:20:56 +00:00
Echo
12c6c6dcf9 Profile editing: Add warning for links (#38148) 2026-03-11 13:19:39 +00:00
Echo
f971670c62 Profile editing: Fix bug with reordering (#38147) 2026-03-11 12:09:54 +00:00
github-actions[bot]
d39f867931 New Crowdin Translations (automated) (#38143) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-11 10:16:06 +00:00
Claire
9916c786e6 Add fallback to Object intent for FEP-3b86 in remote interaction helper (#38130) 2026-03-11 09:42:24 +00:00
diondiondion
316290ba9d Prevent hover card from showing unintentionally (#38112) 2026-03-11 07:42:36 +00:00