Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,619 Commits 74 Branches 58 Tags
f7d1d73073df8acccc5f1584679a510a007a7fa1
Commit Graph

25619 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
f7d1d73073 Merge commit 'b628a98d323902cdcc08fb8d612887dff4dbcd89' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a new user setting, directly next to a glitch-soc-only one.
  The upstream setting would actually replace the glitch-soc one but it is not
  fully implemented yet, so have them side by side now.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Ditto.
- `docker-compose.yml`:
  Conflict due to different registry names. Updated the version while keeping
  glitch-soc's registry.
 2025-07-08 17:27:19 +02:00
Claire
5c5f30ed7e Merge pull request #3122 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 8ee6cee36e
 2025-07-08 17:23:09 +02:00
diondiondion
615896c8ea [Glitch] fix: Fix can't skip search field by tabbing 
Port b5eebd4d2b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-08 16:44:19 +02:00
diondiondion
d9380857db [Glitch] fix: Remove focus highlight when status is clicked in light mode 
Port 3c0767f543 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-08 16:43:56 +02:00
Echo
1c89eb2250 [Glitch] Import Emojibase data 
Port 52bc2f64f4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-08 16:43:23 +02:00
Claire
3efc857fbc Merge commit '8ee6cee36e313fcc39763210dfcd3b871b47cacb' into glitch-soc/merge-upstream 2025-07-08 16:41:01 +02:00
Claire
b628a98d32 Bump version to v4.4.0 (#35291) 2025-07-08 14:26:43 +00:00
Miguel Landaeta
d8fa807998 Bump linzer to 0.7.7 (#35258) 2025-07-08 13:04:16 +00:00
Echo
ef66d8379c Add option to set emoji preferences behind feature flag (#35282) 2025-07-08 10:51:11 +00:00
David Roetzel
8ee6cee36e Better error response to malformed headers (#35278) 2025-07-08 09:31:04 +00:00
github-actions[bot]
71b2120e5c New Crowdin Translations (automated) (#35286) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-08 09:22:38 +00:00
renovate[bot]
b10078633c chore(deps): update dependency libvips to v8.17.1 (#35283) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-07-08 08:35:54 +00:00
diondiondion
b5eebd4d2b fix: Fix can't skip search field by tabbing (#35281) 2025-07-07 15:10:51 +00:00
Claire
fdefc4d2b4 Add ability to manually trigger i18n uploads (#35279) 2025-07-07 09:22:22 +00:00
github-actions[bot]
f6b2609353 New Crowdin Translations (automated) (#35269) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-07 08:21:51 +00:00
Matt Jankowski
bdffdcb12f Remove unused scopes in Account model (#35276) 2025-07-07 08:07:01 +00:00
Claire
1ebb87a6a8 Fix incorrect name in scheduler configuration (#35263) 2025-07-04 07:51:01 +00:00
github-actions[bot]
83660ee381 New Crowdin Translations (automated) (#35261) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-04 07:34:54 +00:00
David Roetzel
1fa72d6c44 Raise better exception on FASP error responses (#35262) 2025-07-04 07:25:42 +00:00
Andy Piper
5a7c0d42f7 Add specific language confirming that we test with BrowserStack and Chromatic (#35248) 
Signed-off-by: Andy Piper <andypiper@users.noreply.github.com>
 2025-07-03 20:51:32 +00:00
Matt Jankowski
e8d2432e6a Fix intermittent failure of TOS model spec from effective date collision (#35244) 2025-07-03 16:28:47 +00:00
Matt Jankowski
2af17adc34 Use ActiveModel::Attributes in admin/status_batch_action (#35255) 2025-07-03 14:43:36 +00:00
Claire
e97f43399b Fix error handling for blank actions in account moderation action form (#35246) 2025-07-03 14:42:48 +00:00
github-actions[bot]
c66c5fd73d New Crowdin Translations (automated) (#35250) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-03 09:47:57 +00:00
diondiondion
3c0767f543 fix: Remove focus highlight when status is clicked in light mode (#35251) 2025-07-03 07:51:12 +00:00
renovate[bot]
70cd1fdc63 fix(deps): update dependency vite-plugin-pwa to v1.0.1 (#35223) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-07-03 07:32:51 +00:00
renovate[bot]
39028dde40 chore(deps): update dependency scenic to v1.9.0 (#35226) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-07-03 07:32:15 +00:00
Matt Jankowski
6e39b5ef04 Use ActiveModel::Attributes for admin/account_action boolean values (#35247) 2025-07-03 07:28:07 +00:00
Matt Jankowski
49db8a9662 Use Account#targeted_reports association where needed (#35249) 2025-07-03 07:28:03 +00:00
Andy Piper
2cfa6cb0e0 Update README with testing tool references. (#35236) 
Signed-off-by: Andy Piper <andypiper@users.noreply.github.com>
 2025-07-02 12:00:15 +00:00
Matt Jankowski
1ae3510ede Add coverage for TOS interstitial interruption flow of web app controller concern (#35235) 2025-07-02 09:21:32 +00:00
github-actions[bot]
6f1135d763 New Crowdin Translations (automated) (#35238) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-02 09:17:03 +00:00
Echo
52bc2f64f4 Import Emojibase data (#35229) 2025-07-02 08:58:39 +00:00
renovate[bot]
b1375328e1 chore(deps): update dependency faker to v3.5.2 (#35239) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-07-02 08:02:33 +00:00
renovate[bot]
9443e2cc4b chore(deps): update dependency opentelemetry-instrumentation-http to v0.25.1 (#35240) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-07-02 08:02:30 +00:00
Renaud Chaput
3a533c6c8d Bump version to 4.5.0-alpha.1 (#35231) 2025-07-02 08:00:43 +00:00
Matt Jankowski
c047014214 Add coverage for valid_locale_or_nil languages helper method (#34866) 2025-07-02 07:34:42 +00:00
Claire
8bb81f9496 Merge pull request #3115 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to a203a05eb1
v4.4.0-rc.1 		2025-07-01 20:51:10 +02:00
Claire
68b05e994f Fix error on log-in from old users requiring ToS interstitial when said ToS has been removed (#35233) 2025-07-01 17:43:59 +00:00
diondiondion
605df74f06 [Glitch] fix: Fix column header overlapping mobile menu on old Safari 
Port e6e8974785 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-01 18:48:16 +02:00
Claire
98e90b7c1f Merge commit 'a203a05eb10db82e1db2d75398e0261cfe4d33e4' into glitch-soc/merge-upstream 2025-07-01 18:47:15 +02:00
Claire
a203a05eb1 Fix missing newline in changelog (#35227) 2025-07-01 12:31:55 +00:00
Claire
68090cd8be Bump version to v4.4.0-rc.1 (#35196) 2025-07-01 09:21:32 +00:00
github-actions[bot]
dd064aaa36 New Crowdin Translations (automated) (#35224) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-01 09:02:26 +00:00
diondiondion
e6e8974785 fix: Fix column header overlapping mobile menu on old Safari (#35225) 2025-07-01 08:53:43 +00:00
Claire
5e95c63b5b Merge pull request #3114 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to c357a7f8d6
 2025-07-01 10:45:20 +02:00
Renaud Chaput
498af63b85 chore: validate the project funding.json association (#35221) 2025-06-30 16:21:52 +00:00
diondiondion
0bb2dc9d26 [Glitch] fix: Fix popover/dialog backgrounds not blurred on older Webkit browsers 
Port e8a603b18f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-30 17:56:29 +02:00
Claire
2eec4da8fc Merge commit 'c357a7f8d697ede4df4be74456b0497118c9d049' into glitch-soc/merge-upstream 2025-06-30 17:52:22 +02:00
David Roetzel
c357a7f8d6 Add optional bulk mailer settings (#35203) 2025-06-30 14:49:14 +00:00