Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 07:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,653 Commits 74 Branches 58 Tags
70b5ec434932a27c6b5c5d1e644f6b59da1b14fd
Commit Graph

25653 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
70b5ec4349 Merge pull request #3129 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 3b52dca405
 2025-07-11 20:33:12 +02:00
Echo
500e7eccc6 [Glitch] Make bio hashtags open the local page instead of the remote instance 
Port 853a0c466e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-11 19:00:16 +02:00
Echo
1dcf6a3937 [Glitch] Expose enabled features to the frontend 
Port 94bceb8683 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-11 18:59:43 +02:00
Claire
1716f8da71 Merge commit '3b52dca4057560c58b260433722d91650fcd5040' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a `features` attribute where glitch-soc had extra ones.
  Added `features` like upstream did.
 2025-07-11 18:53:47 +02:00
Claire
3b52dca405 Fix quote attributes missing from Mastodon's context (#35354) 2025-07-11 16:35:06 +00:00
Echo
853a0c466e Make bio hashtags open the local page instead of the remote instance (#35349) 2025-07-11 15:18:34 +00:00
Echo
94bceb8683 Expose enabled features to the frontend (#35348) 2025-07-11 13:15:22 +00:00
Claire
88b0f3a172 Simplify DatabaseViewRecord.refresh (#35252) 2025-07-11 08:36:05 +00:00
github-actions[bot]
b69b5ba775 New Crowdin Translations (automated) (#35344) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-11 08:14:39 +00:00
Matt Jankowski
c442589593 Use ActiveModel::Attributes in FollowLimitable concern (#35327) 2025-07-10 07:40:56 +00:00
renovate[bot]
28633a504a chore(deps): update dependency json-schema to v5.2.1 (#35337) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-07-10 07:38:07 +00:00
Matt Jankowski
ad78701b6f Mark private methods in AnnualReport::TopStatuses (#35256) 2025-07-10 07:35:40 +00:00
Matt Jankowski
1496488771 Add Status#not_replying_to_account scope for annual report classes (#35257) 2025-07-10 07:35:04 +00:00
renovate[bot]
dd3d958e75 fix(deps): update dependency core-js to v3.44.0 (#35284) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-07-10 07:23:54 +00:00
github-actions[bot]
b363a3651d New Crowdin Translations (automated) (#35335) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-10 07:23:27 +00:00
renovate[bot]
86645fc14c chore(deps): update dependency rubocop to v1.78.0 (#35289) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-07-10 07:23:23 +00:00
Matt Jankowski
f9beecb343 Improve Accounts CLI prune spec (#35302) 2025-07-10 07:23:09 +00:00
Matt Jankowski
4ecfbd3920 Add Status.only_polls (and without polls) scope (#35330) 2025-07-10 07:13:22 +00:00
Claire
a315934314 Fix styling of external log-in button (#35320) 2025-07-10 06:56:40 +00:00
Claire
4dbdc436ed Merge pull request #3127 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to e9170e2de1
 2025-07-10 02:07:17 +02:00
Claire
55914c6434 [Glitch] Fix replying from media modal or pop-in-player tagging user @undefined 
Port e7c5c25dce81bd4e32a4bf599c759303420c47e3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-10 01:22:14 +02:00
Echo
c2d76e8994 [Glitch] Emoji Indexing and Search 
Port a1e8813522 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-10 01:21:51 +02:00
Claire
e2a867507c Merge commit 'e9170e2de1d75e02f04ad39f2af131c70189fb50' into glitch-soc/merge-upstream 2025-07-10 01:10:32 +02:00
Claire
e9170e2de1 Bump version to v4.4.1 (#35329) 2025-07-09 16:22:25 +00:00
Claire
5cfc1fabcf Fix nearly every sub-directory being crawled as part of Vite build (#35323) 2025-07-09 14:34:16 +00:00
David Roetzel
786b12e379 Relax error restriction in initializer (#35321) 2025-07-09 14:22:47 +00:00
Claire
e7c5c25de8 Fix replying from media modal or pop-in-player tagging user @undefined (#35317) 2025-07-09 12:13:51 +00:00
Echo
a1e8813522 Emoji Indexing and Search (#35253) 2025-07-09 09:55:41 +00:00
github-actions[bot]
76c1446416 New Crowdin Translations (automated) (#35310) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-09 09:10:55 +00:00
Claire
8bd2c87399 Fix support for special characters in various environment variables (#35314) 
Co-authored-by: Matt Jankowski <matt@jankowski.online>
 2025-07-09 08:58:41 +00:00
Matt Jankowski
1e2d77f2c7 Use if_exists: true when removing duplicate indexes (#35309) 2025-07-09 08:45:29 +00:00
Matt Jankowski
fb6c22f5c2 Use touch to record viewing annual report (#35296) 2025-07-09 08:04:00 +00:00
Matt Jankowski
f7259f625f Prefer on: :update in Tag validation declaration (#35297) 2025-07-09 08:03:39 +00:00
Claire
e783f796c9 Merge pull request #3124 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to b628a98d32
 2025-07-08 17:47:27 +02:00
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