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
26,281 Commits 74 Branches 58 Tags
d72ae0dd707779a044c54e6d1b56fe8c66c834c2
Commit Graph

26281 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
d72ae0dd70 Merge pull request #3188 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 90765342a3
 2025-09-17 22:27:02 +02:00
Claire
16e479e3ec Merge commit '90765342a35abd6883e57f5419342f491b83e250' into glitch-soc/merge-upstream 2025-09-17 21:46:08 +02:00
Claire
90765342a3 Fix posts when omitting quote policy and default policy is nobody (#36158) 2025-09-17 19:16:36 +00:00
diondiondion
1e70fbfc52 [Glitch] Create reusable Alert/Snackbar component 
Port 085e9ea676 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-17 20:13:51 +02:00
Claire
21cf2673f2 Merge commit '085e9ea676f11cad4ae7fafce5ceadb16ecd0f83' into glitch-soc/merge-upstream 2025-09-17 20:13:13 +02:00
Claire
3a31ef11cc Merge commit 'db0cd9489c70e985da961a585f3a809ca449dccf' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/post_status_service.rb`:
  Upstream updated the logic to move the CW to the text content.
  Glitch-soc does not move CW to text content but has some logic
  to avoid the text being empty. Update the logic according to upstream's
  change.
- `docker-compose.yml`:
  Conflict because of different paths for composer images.
  Updated version as upstream did while keeping our path.
 2025-09-17 20:10:28 +02:00
Echo
0a6895f8b9 [Glitch] Refactor: Replace all display name usage for new component 
Port dfef7d9407 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-17 19:36:18 +02:00
Claire
210786efd8 Merge commit '2664bb628b7bf77b9efa4143423486cf16d17ba7' into glitch-soc/merge-upstream 2025-09-17 18:17:18 +02:00
diondiondion
085e9ea676 Create reusable Alert/Snackbar component (#36141) 2025-09-17 15:24:39 +00:00
Claire
db0cd9489c Bump version to v4.4.4 (#36152) 2025-09-17 12:19:03 +00:00
Claire
fbf093a87f Fix CW being moved to text when posting quote posts with empty text (#36151) 2025-09-17 12:19:00 +00:00
Claire
2664bb628b Fix quote with CW but no text being shown without CW (#36150) 2025-09-17 12:00:58 +00:00
renovate[bot]
8a6ef2ebdf fix(deps): update dependency jsdom to v27 (#36107) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-17 09:46:30 +00:00
renovate[bot]
de3692ca00 chore(deps): update docker.io/ruby docker tag to v3.4.6 (#36145) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-17 09:44:16 +00:00
renovate[bot]
72fff2e54f chore(deps): update dependency ruby to v3.4.6 (#36135) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-17 09:44:12 +00:00
Echo
dfef7d9407 Refactor: Replace all display name usage for new component (#36137) 2025-09-17 09:00:57 +00:00
github-actions[bot]
ff03938808 New Crowdin Translations (automated) (#36143) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-17 07:27:03 +00:00
Jeong Arm
3055afd1d2 Fix applying user's default quote policy if API parameter is not specified (#36132) 2025-09-17 07:08:55 +00:00
Claire
12d61e0d84 Merge pull request #3184 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to d9b70bbde1
 2025-09-16 21:58:56 +02:00
Claire
322b6d8dd5 [Glitch] Change reblog button to immediately show the interaction modal when logged out 
Port d1402af0b2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-16 18:37:00 +02:00
Claire
f659190e18 [Glitch] Change wording of disabled quote state to “You are not allowed to quote this post” 
Port 41ab10f88c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-16 18:36:27 +02:00
Claire
26193a119b Merge commit 'd9b70bbde13b78709b48be6c979bc7520e81520a' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper close to a glitch-soc one.
  Added upstream's helper.
 2025-09-16 18:30:30 +02:00
Eugen Rochko
d9b70bbde1 Fix login page linking to other pages within OAuth authorization flow (#36115) 2025-09-16 14:25:21 +00:00
Claire
d1402af0b2 Change reblog button to immediately show the interaction modal when logged out (#36138) 2025-09-16 12:23:44 +00:00
Claire
41ab10f88c Change wording of disabled quote state to “You are not allowed to quote this post” (#36129) 2025-09-16 10:24:58 +00:00
github-actions[bot]
96d0f6f049 New Crowdin Translations (automated) (#36133) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-16 09:43:02 +00:00
Claire
eeb84cbf76 Merge pull request #3180 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 38fa0102c1
 2025-09-16 00:32:15 +02:00
diondiondion
882a0a1040 [Glitch] Fix logged-out quote menu UX, simplify Interaction dialog copy 
Port 38fa0102c1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-15 18:44:12 +02:00
diondiondion
504f221ec8 [Glitch] Don't show more than one quote removal hint on notifications page 
Port 887e982aa2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-15 18:42:09 +02:00
Lycolia Rizzim
bce8469c99 [Glitch] Fix: clicking a status header opens the status details, no longer navigate to profile 
Port 4702e369e9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-15 18:41:40 +02:00
diondiondion
58016b9c33 [Glitch] In composer, show when quoted post is also a quote post 
Port 681a9cfda1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-15 18:41:18 +02:00
Claire
cc52833296 Merge commit '38fa0102c111f1c0cff5a42eba6882ffae4ca109' into glitch-soc/merge-upstream 2025-09-15 18:39:09 +02:00
Claire
6c5a4702d9 Use default quote policy setting in the absence of API parameter (#36094) 2025-09-15 15:53:21 +00:00
diondiondion
38fa0102c1 Fix logged-out quote menu UX, simplify Interaction dialog copy (#36124) 2025-09-15 15:38:11 +00:00
Claire
943cdc5b21 Add example post with manual quote approval policy to dev:populate_sample_data (#36099) 2025-09-15 15:35:33 +00:00
diondiondion
887e982aa2 Don't show more than one quote removal hint on notifications page (#36128) 2025-09-15 15:27:43 +00:00
Claire
e4bb0fc43a Add server-side support for handling posts with a quote policy allowing followers to quote (#36127) 2025-09-15 15:03:44 +00:00
Claire
f5591346cc Add following_url to accounts (#36093) 2025-09-15 13:45:57 +00:00
renovate[bot]
94dcf8c96c fix(deps): update dependency axios to v1.12.0 [security] (#36116) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-15 10:02:38 +00:00
Lycolia Rizzim
4702e369e9 Fix: clicking a status header opens the status details, no longer navigate to profile (#36118) 2025-09-15 09:43:14 +00:00
diondiondion
681a9cfda1 In composer, show when quoted post is also a quote post (#36119) 2025-09-15 09:21:03 +00:00
renovate[bot]
38c0c9ba3b chore(deps): update dependency libvips to v8.17.2 (#36117) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-15 08:55:15 +00:00
github-actions[bot]
93c977eb3d New Crowdin Translations (automated) (#36105) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-15 08:28:25 +00:00
renovate[bot]
8e46252862 chore(deps): update dependency pundit to v2.5.1 (#36097) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-15 08:15:28 +00:00
Claire
85f414da8a Merge pull request #3179 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 06803422da
 2025-09-13 13:57:25 +02:00
Claire
5da295fa4d Merge commit '06803422da3794538cd9cd5c7ccd61a0694ef921' into glitch-soc/merge-upstream 2025-09-13 11:12:22 +02:00
Echo
06803422da Make Vite respect CSP for styles (#36089) 2025-09-12 13:37:26 +00:00
Claire
82b26603fe Fix quote posts with CW and no text being rejected (#36095) 2025-09-12 13:10:31 +00:00
Eugen Rochko
30b31a89e6 Add schema.org markup to SEO-enabled posts (#36075) 2025-09-12 09:12:07 +00:00
github-actions[bot]
b59e06fba7 New Crowdin Translations (automated) (#36092) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-12 09:04:44 +00:00