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

8578 Commits

Author SHA1 Message Date
Claire
4bea9a0a66 Merge commit '04492e7f934d07f8e89fa9c3d4fe3381f251e8a2' into glitch-soc/merge-upstream 2025-03-07 18:34:27 +01:00
Claire
079fa6bade [Glitch] Move app/javascript/hooks to app/javascript/flavours/glitch/hooks 
Port b57687083f4af178f2e2f43665eb4e49d32a50c2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-07 17:45:57 +01:00
Claire
3c0775c9b1 [Glitch] Change web client settings to be saved earlier and more often 
Port 00dbefdbbff4bf7edce2fdad1a6c1832f3f345de to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-07 17:40:20 +01:00
Eugen Rochko
180e9e5d70 [Glitch] Add effective date to terms of service 
Port cadda2f9571873f0fb245399de7e20901efb5e72 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-07 17:39:58 +01:00
Claire
71afcd42e1 [Glitch] Fix preview cards under Content Warnings not being shown in detailed statuses 
Port 26a3081699fa991ec315bed089c454272d4a169b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-07 17:39:03 +01:00
Claire
dbd3e05812 Merge commit 'b57687083f4af178f2e2f43665eb4e49d32a50c2' into glitch-soc/merge-upstream 2025-03-07 17:37:36 +01:00
Eugen Rochko
76eac9039b [Glitch] Fix infinite scroll not working on profile media tab in web UI (#33860) 
Port 43f616a1c86eba451ecfe302ad5ae8171244224b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-07 15:09:28 +01:00
Claire
2bf5aee469
Fix avatar fallback in media gallery (#34106) 2025-03-07 13:22:05 +00:00
Claire
9d5a9123b9 Merge commit 'ce23342d72a7f2ca6f8c35727c86ba54c9c365ca' into glitch-soc/merge-upstream 2025-03-07 13:15:10 +01:00
Eugen Rochko
539fe533a2 [Glitch] Fix moved notice on profiles in web UI 
Port d399244d4de929b94ae192d285df2653f0b4eb29 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-06 21:56:32 +01:00
Eugen Rochko
c915165370 [Glitch] Refactor <Header> into TypeScript 
Port ebde60ca82318d20628b591ef31ab15aa92edd3a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-06 21:56:30 +01:00
Claire
e2ca5850c0 Convert account ActionBar to TypeScript 2025-03-06 21:27:45 +01:00
Eugen Rochko
ed6544477b [Glitch] Change alt text reminder to not appear for private mentions in web UI 
Port d50110a17aa35fb2e836a676ae9d3a8559bedb12 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-06 20:13:49 +01:00
Claire
af668b9837 [Glitch] Add optional delete_media parameter to DELETE /api/v1/statuses/:id 
Port e71fb450e08515b53a33bdef1744e0ba7ce6f23b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-06 20:12:43 +01:00
Claire
b6f3cfb302 Merge commit 'e5655a5f65eb8116640ae434125553e0fe77f35e' into glitch-soc/merge-upstream 2025-03-06 20:10:00 +01:00
renovate[bot]
d2ce9a6064
chore(deps): update eslint (non-major) (#33061) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2025-03-06 13:55:44 +00:00
Claire
db269a4c0a
Change hashtag suggestion to prefer personal history capitalization (#34070) 2025-03-06 10:00:33 +00:00
Damien Erambert
debe6c0545
Add emoji from Twemoji 15.0 to the emoji picker/completion (#33395) 2025-03-05 17:05:15 +00:00
Claire
b57687083f
Move app/javascript/hooks to app/javascript/mastodon/hooks (#34077) 2025-03-05 16:55:53 +00:00
Claire
00dbefdbbf
Change web client settings to be saved earlier and more often (#34074) 2025-03-05 15:42:33 +00:00
Eugen Rochko
cadda2f957
Add effective date to terms of service (#33993) 2025-03-05 09:01:33 +00:00
Claire
26a3081699
Fix preview cards under Content Warnings not being shown in detailed statuses (#34068) 2025-03-05 08:43:31 +00:00
Eugen Rochko
43f616a1c8
Fix infinite scroll not working on profile media tab in web UI (#33860) 2025-03-03 14:16:17 +00:00
Eugen Rochko
d399244d4d
Fix moved notice on profiles in web UI (#34052) 2025-03-03 08:24:06 +00:00
Eugen Rochko
d50110a17a
Change alt text reminder to not appear for private mentions in web UI (#33784) 2025-02-28 18:02:58 +00:00
Claire
e71fb450e0
Add optional delete_media parameter to DELETE /api/v1/statuses/:id (#33988) 2025-02-28 13:39:01 +00:00
github-actions[bot]
5f486a1424
New Crowdin Translations (automated) (#34027) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-28 08:29:06 +00:00
Claire
1cdd91d6f1 Merge commit '6b519cfefa93a923b19d0f20c292c7185f8fd5f5' into glitch-soc/merge-upstream 2025-02-27 15:52:20 +01:00
github-actions[bot]
cde3167d09
New Crowdin Translations (automated) (#34009) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-27 09:36:16 +00:00
Claire
a682bd19f5 Merge commit '20531d1e078a27116dea53ce21c1b32bf3774eca' into glitch-soc/merge-upstream 2025-02-25 18:52:24 +01:00
Eugen Rochko
ebde60ca82
Refactor <Header> into TypeScript (#33956) 2025-02-25 15:30:46 +00:00
github-actions[bot]
33643c4c07
New Crowdin Translations (automated) (#33996) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-25 13:08:40 +00:00
github-actions[bot]
5a3fb4594b
New Crowdin Translations (automated) (#33977) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-24 08:48:56 +00:00
Claire
524e8992ad Merge commit 'db971976853103017b1561f2c4f9406fa00c0a2e' into glitch-soc/merge-upstream 2025-02-22 21:31:46 +01:00
github-actions[bot]
2788808b07
New Crowdin Translations (automated) (#33967) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-21 07:41:14 +00:00
Eugen Rochko
12d0533bd7
Change "Specific people" to "Private mention" in menu in web UI (#33963) 2025-02-21 07:29:34 +00:00
github-actions[bot]
70f8fb6d08
New Crowdin Translations (automated) (#33960) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-19 08:17:23 +00:00
Claire
f3bc50778b Merge commit 'f1d4be1e7509f795706ff2310c5fc36e0e79bf4d' into glitch-soc/merge-upstream 2025-02-18 20:38:57 +01:00
github-actions[bot]
e2eceaf2fa
New Crowdin Translations (automated) (#33949) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-18 10:23:53 +00:00
github-actions[bot]
a3ef72a541
New Crowdin Translations (automated) (#33933) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-17 09:22:13 +00:00
github-actions[bot]
5cd80b7836
New Crowdin Translations (automated) (#33925) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-14 08:38:48 +00:00
github-actions[bot]
58a029335b
New Crowdin Translations (automated) (#33918) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-13 10:50:09 +00:00
github-actions[bot]
e0b7ecfb0b
New Crowdin Translations (automated) (#2933) 
* New Crowdin translations

* Update simple_form.no.yml

* Update no.yml

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-02-12 20:53:09 +01:00
Claire
28d85ede4c Merge commit '4fc8c6912979e8fd7882fb360b77e677ffd68565' into glitch-soc/merge-upstream 2025-02-12 18:40:21 +01:00
github-actions[bot]
e918d4e3e8
New Crowdin Translations (automated) (#33899) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-12 08:33:41 +00:00
github-actions[bot]
0b4e5b64f9
New Crowdin Translations (automated) (#33885) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-11 06:50:18 +00:00
Matt Jankowski
83a271c003
Run optimize PNG on archetypes images (#33882) 2025-02-11 06:45:22 +00:00
github-actions[bot]
804e6832d3
New Crowdin Translations (automated) (#33861) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-10 10:10:38 +00:00
Claire
a417d6f3fc Merge commit '1cf30717dbe7a0038a645c62f19deef7efc42207' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/precompute_feed_service.rb`:
  Upstream added an option to skip half-generated timelines.
  We have a conflict because we still maintain upstream's old chronological DM
  timelines.
  Update our code to apply the same logic to the DM timelines.
 2025-02-07 21:21:28 +01:00
github-actions[bot]
b7bc7cd087
New Crowdin Translations (automated) (#33856) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-07 08:51:09 +00:00