tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,201 Commits 5 Branches 0 Tags
38f623eee7ff41a4cc43d07d4952239cd38e3ccd
Commit Graph
27201 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
diondiondion 38f623eee7 [Glitch] Minor Wrapstodon tweaks, add stub Storybook page 
Port 91500a7f53 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-10 18:09:09 +01:00
Claire 17ba99e5de Merge commit 'd6f2a3ac8d61e0828a17f68a6e9094d0f4662f4c' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/wrapstodon/show.html.haml`:
  Conflict because of glitch-soc's theming change.
  Adapted upstream's changes.
- `docker-compose.yml`:
  Conflict because of container repo name change.
  Adapted upstream's changes.
- `yarn.lock`:
  Conflict because of an additional glitch-soc dependency.
  Updated the dependencies upstream did.
 2025-12-10 18:05:44 +01:00
Claire d6f2a3ac8d Bump version to v4.5.3 (#37166) 2025-12-10 16:42:19 +00:00
diondiondion c42b9f6996 Implement custom font for Wrapstodon heading (#37193) 2025-12-10 16:26:46 +00:00
Echo 76184c998c Fix issue where Wrapstodon was pushed to the bottom of the feed (#37190) 2025-12-10 15:55:12 +00:00
diondiondion 8137ce87ce Fix Wrapstodon Storybook & other Wrapstodon issues (#37189) 2025-12-10 14:07:25 +00:00
renovate[bot] 37426288d9 Update dependency postcss-preset-env to v10.5.0 (#37132) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-10 12:53:39 +00:00
renovate[bot] 801fee7593 Update dependency test-prof to v1.5.0 (#37127) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-10 12:53:29 +00:00
Claire 6838497fe8 Add title and description to Opengraph data for Wrapstodon share page (#37188) 2025-12-10 11:27:10 +00:00
Claire 7b8a5d42f1 Remove unused time series details from 2025 annual report (#37187) 2025-12-10 11:02:24 +00:00
Claire cd71fdcdff Merge pull request #3311 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 9d81561bb2
 2025-12-10 11:53:00 +01:00
diondiondion 91500a7f53 Minor Wrapstodon tweaks, add stub Storybook page (#37186) 2025-12-10 09:05:14 +00:00
Claire 5422e43e31 Fix wrapstodon standalone page not loading JS module 2025-12-10 09:49:09 +01:00
diondiondion 5a66331003 [Glitch] Update Wrapstodon design 
Port 9d81561bb2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-09 18:27:14 +01:00
Matt Jankowski 09e3955145 [Glitch] Fix misc comment typos 
Port ac71771d98 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-09 18:10:04 +01:00
Echo e554e5723d [Glitch] Fix emoji on Wrapstodon 
Port 9702cbb41c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-09 18:09:22 +01:00
Claire 315f5e5a31 Merge commit '9d81561bb2440c8fb9a75bd05277120aff346b1e' into glitch-soc/merge-upstream 2025-12-09 18:06:56 +01:00
diondiondion 9d81561bb2 Update Wrapstodon design (#37169) 2025-12-09 16:51:05 +00:00
Matt Jankowski ac71771d98 Fix misc comment typos (#37183) 2025-12-09 16:09:01 +00:00
Claire 697569e5f9 Add account_id attribute to AnnualReport entity (#37182) 2025-12-09 15:59:40 +00:00
Claire 4cdcdaa7d9 Fix streaming image build after removal of .yarn (#37181) 2025-12-09 15:36:46 +00:00
Echo 9702cbb41c Fix emoji on Wrapstodon (#37177) 2025-12-09 10:36:08 +00:00
David Roetzel ea768c17db Add counter cache to collections (#37176) 2025-12-09 10:31:35 +00:00
renovate[bot] 5347cabf3e Update dependency oj to v3.16.13 (#37135) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-09 10:07:35 +00:00
renovate[bot] eef40ba96b Update dependency hiredis-client to v0.26.2 (#37137) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-09 09:47:12 +00:00
Matt Jankowski 9063c3b660 Remove yarn patch for babel-plugin-lodash, removed during Vite upgrade (#37161) 2025-12-09 09:30:57 +00:00
Matt Jankowski e147947eb8 Add wrapstodon page spec (#37168) 2025-12-09 09:27:29 +00:00
Claire 8c52889c86 Merge pull request #3307 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 607449336d
 2025-12-08 17:14:29 +01:00
Claire 05e45beb34 Merge commit '607449336da198ea9fe9c014220a5374a0ca1ae4' into glitch-soc/merge-upstream 2025-12-08 16:33:27 +01:00
Claire 607449336d Merge commit from fork 2025-12-08 15:44:08 +01:00
github-actions[bot]andGitHub Actions 85bf5be604 New Crowdin Translations (automated) (#37146) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-12-08 11:42:24 +00:00
David Roetzel cf23f0414f Add id to collection serializers (#37157) 2025-12-08 11:40:17 +00:00
David Roetzel 55becaa1b5 Preload tag to prevent n+1 (#37154) 2025-12-08 10:30:10 +00:00
David Roetzel 8625721805 Draft API to get all collections by an account (#37139) 2025-12-08 08:56:13 +00:00
Claire cd34331842 Merge pull request #3306 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 1ae3b4672b
 2025-12-06 11:35:37 +01:00
Claire 691f4e3210 [Glitch] Fix “Delete and Redraft” on a non-quote being treated as a quote post in some cases 
Port 1ae3b4672b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-05 20:08:05 +01:00
diondiondion 7f1862b67e [Glitch] Increase maximum height of media items on desktop 
Port ce22c835ac to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-05 20:07:28 +01:00
Claire 71cda79e3b [Glitch] Remove more unused data from 2025 annual reports 
Port 9b851616fe to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-05 20:06:12 +01:00
diondiondion c3f254f170 [Glitch] Fix inversion of emoji colours based on dark/light mode 
Port 591776d7ad to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-05 20:05:32 +01:00
Echo 05691293f0 [Glitch] Fixes YouTube embeds 
Port 46f3b39fae to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-05 20:01:52 +01:00
Claire 2f6cdd6d47 Merge commit '1ae3b4672bffbc4aaf26f60c7063d6901239de5d' into glitch-soc/merge-upstream 2025-12-05 20:00:40 +01:00
Claire 4625bbe282 Merge pull request #3305 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstrema changes up to 65b216353e
 2025-12-05 19:58:48 +01:00
diondiondion 4dc196b595 [Glitch] Handle dark/light/contrast theme modes in common CSS 
Port 65b216353e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-05 19:29:37 +01:00
Claire 3b4c4c5b09 Merge commit '65b216353e9bc9ae8517d967f8c2cd8122551fdc' into glitch-soc/merge-upstream 
- `app/helpers/application_helper.rb`:
  Upstream updated the classes used for theming purposes,
  but glitch-soc has its own theming system.
  Adapted upstream's changes.
- `spec/helpers/application_helper_spec.rb`:
  Upstream updated the classes used for theming purposes,
  but glitch-soc has its own theming system.
  Adapted upstream's changes.
 2025-12-05 19:25:40 +01:00
Matt Jankowski 7fe3e80758 Rely on locale for options order in DOB input (#36895) 2025-12-05 15:21:22 +00:00
Claire 1ae3b4672b Fix “Delete and Redraft” on a non-quote being treated as a quote post in some cases (#37140) 2025-12-05 15:17:48 +00:00
Echo 007ae588d8 Fix incorrect date for Wrapstodon start (#37138) 2025-12-05 14:12:26 +00:00
diondiondion ce22c835ac Increase maximum height of media items on desktop (#37136) 2025-12-05 13:39:48 +00:00
Claire 9b851616fe Remove more unused data from 2025 annual reports (#37134) 2025-12-05 13:36:37 +00:00
diondiondion 591776d7ad Fix inversion of emoji colours based on dark/light mode (#37120) 2025-12-05 10:08:59 +00:00