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

10616 Commits

Author SHA1 Message Date
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 89b7a3d7fb73ba79d33cab9755424b4aa2050b1b 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 d26269d68b0110ddb05a3f9ff221d2619db937e6 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 91407ecc150eec9400f8685ec46fadd866cb68fb 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 890b2673fcb8416ec62d71f993d57b47e257b2f8 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 420136e83b65a467a62da739a679ccb579525e63 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 13c94db9e7d7f35264c7e1ac93f6e693b0014592 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 51894ac247c84f577b46e69094b3581fd6e78375 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 3ef7d2835a5ef36bac71cd392710b5ea10602cb1 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 4a08ab64d1d22e0572e85a2ace18347ec00b2ff6 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 20932752fee1dc3da856fdb9fadc8df5aaae23f1 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 12c6c6dcf9a6875db03dbb9d66eed897c1d964e3 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 f971670c620db61da4dadff07efe86b51c145bfd 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 9916c786e67080e71b6f8fc36d11f5d8daa233d9 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 316290ba9d25358f88a9616ba9cbc30b8ccef453 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
Duarte Serrano
42716c94bf [Glitch] Fix short numbers rounding up instead of truncating (#37899) 
Port 75ef5bfd2df1ce40d3fe1bd43dfb947518847d9d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-10 18:12:54 +01:00
Eugen Rochko
4150cee7a5 [Glitch] Add support for FEP-3b86 (Activity Intents) 
Port 69b1f60f4e46cf58e7240c2bfb81588accc1af6f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-10 18:12:54 +01:00
diondiondion
19a8c80762 [Glitch] Fix collections not shown on profile when there are no featured tags or accounts 
Port 7d58ce309c12fcda44e79420d2d5a197c47efbea to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-10 18:12:54 +01:00
diondiondion
7e57d00af6 [Glitch] Fix erratic scroll-to-right on delete & redraft in Advanced UI 
Port 71f9763e68a29fb4498d2f4c5f2621e6cf665b7c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-10 18:12:54 +01:00
Claire
5fdcac60b9 Merge commit '64629eadb71afab79a741b016dc56a8bdf1d46f2' into glitch-soc/merge-upstream 2026-03-10 18:04:32 +01:00
Duarte Serrano
75ef5bfd2d
Fix short numbers rounding up instead of truncating (#37899) (#38114) 2026-03-10 11:28:44 +00:00
Eugen Rochko
69b1f60f4e
Add support for FEP-3b86 (Activity Intents) (#38120) 2026-03-10 10:21:24 +00:00
diondiondion
7d58ce309c
Fix collections not shown on profile when there are no featured tags or accounts (#38113) 2026-03-10 10:02:03 +00:00
github-actions[bot]
b64bed5acd
New Crowdin Translations (automated) (#38122) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-10 10:01:38 +00:00
diondiondion
71f9763e68
Fix erratic scroll-to-right on delete & redraft in Advanced UI (#38116) 2026-03-09 17:42:54 +00:00