tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,836 Commits 5 Branches 0 Tags
c8e7d229448dbefdfdb23dd6677137d45fdad1d1
Commit Graph
1754 Commits
Author SHA1 Message Date
Claire 4b491674b2 Merge commit '887336f2c66b6ac5049d10bf5f27fa69a15e0745' into glitch-soc/merge-upstream 2025-04-08 19:12:28 +02:00
github-actions[bot]andGitHub Actions 9a05688326 New Crowdin Translations (automated) (#34374) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-04-07 06:45:26 +00:00
Claire 99e3ea232f Merge commit '5f87ae101c5e0e940e148d493eaac1ce31fe24c1' into glitch-soc/merge-upstream 2025-04-04 20:00:24 +02:00
github-actions[bot]andGitHub Actions 58e3e43e06 New Crowdin Translations (automated) (#34366) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-04-04 07:24:27 +00:00
github-actions[bot]andGitHub Actions e1d6748422 New Crowdin Translations (automated) (#34360) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-04-03 08:42:19 +00:00
Eugen RochkoandClaire 2c70c28bbb Refactor <DomainBlocks> to TypeScript (#34347) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-04-02 12:31:39 +00:00
github-actions[bot]andGitHub Actions 324acff572 New Crowdin Translations (automated) (#34348) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-04-02 07:14:45 +00:00
Claire e0406fcf02 Merge commit 'e8270e2807727e1cf6a47a40442b3038c5bca858' into glitch-soc/merge-upstream 
Conflicts:
- `.eslintrc.js`:
  Upstream moved it to `eslint.config.mjs`.
  Ported the glitch-soc changes there.
- `yarn.lock`:
  Upstream updated dependencies close to glitch-soc-only dependencies.
  Ported upstream's changes.
 2025-04-01 20:59:34 +02:00
github-actions[bot]andGitHub Actions b2b532708e New Crowdin Translations (automated) (#34333) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-04-01 06:20:23 +00:00
Claire aebb6c8ab7 Merge commit 'b4e56822c72db54ba338940e2517a4e25e2159a6' into glitch-soc/merge-upstream 2025-03-31 17:12:44 +02:00
github-actions[bot]andGitHub Actions 758d2da887 New Crowdin Translations (automated) (#34311) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-31 07:21:33 +00:00
Claire c06527cf5d Merge commit 'e5fd61a84eb3a919c1e53f688e424df9d0f20924' into glitch-soc/merge-upstream 2025-03-28 20:48:53 +01:00
Claire a5eaa95bb2 Merge commit 'e28b64ac2dcd381f8b7e6bcfc2cc2b2ed3121cd9' into glitch-soc/merge-upstream 2025-03-28 18:48:04 +01:00
Eugen Rochko e5fd61a84e Refactor <Video> to TypeScript (#34284) 2025-03-28 12:15:43 +00:00
github-actions[bot]andGitHub Actions e28b64ac2d New Crowdin Translations (automated) (#34297) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-28 09:47:53 +00:00
Claire 166514d252 Merge commit 'aa575341c2da1e84d349ca0b42211b0da30a2254' into glitch-soc/merge-upstream 2025-03-27 19:40:04 +01:00
github-actions[bot]andGitHub Actions 99f93e675a New Crowdin Translations (automated) (#34290) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-27 08:07:54 +00:00
Claire 449dc30739 Merge commit 'c43508b3e0b05c5e739d726bad53f1eef89e9376' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/content_security_policy.rb`:
  Upstream added support for `EXTRA_MEDIA_HOSTS` which is very similar to
  glitch-soc's `EXTRA_DATA_HOST`.
  Deprecate `EXTRA_DATA_HOST` FOR `EXTRA_MEDIA_HOST`.
 2025-03-26 19:14:26 +01:00
github-actions[bot]andGitHub Actions dd6c573cc3 New Crowdin Translations (automated) (#34276) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-26 07:42:25 +00:00
Claire 745c445e7e Merge commit 'e1dbbf6c9db6dbf3f356dae4c59fa05299372370' into glitch-soc/merge-upstream 2025-03-25 19:59:59 +01:00
github-actions[bot]andGitHub Actions 90bf67f053 New Crowdin Translations (automated) (#34265) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-25 09:05:59 +00:00
Claire e7498887a7 Merge commit '2e9b2df570af19b67a5ccc754c7b581034ca79c6' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Upstream removed some code that somehow had been modified in glitch-soc.
  Removed it as upstream did.
 2025-03-24 20:06:25 +01:00
github-actions[bot]andGitHub Actions b892b15ba6 New Crowdin Translations (automated) (#34240) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-24 08:35:40 +00:00
Claire f1fa6b3cd0 Merge commit '1960aac90b16fce1ec620ac990aa931efcf04700' into glitch-soc/merge-upstream 2025-03-22 15:41:48 +01:00
github-actions[bot]andGitHub Actions 5eba86e2d1 New Crowdin Translations (automated) (#34231) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-21 07:31:42 +00:00
github-actions[bot]andGitHub Actions 936d3a7de9 New Crowdin Translations (automated) (#34222) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-20 09:32:41 +00:00
Claire 971690caf2 Merge commit 'f7b1769e8a69e2831493f3a704d68efa5cf9beff' into glitch-soc/merge-upstream 2025-03-19 20:09:14 +01:00
github-actions[bot]andGitHub Actions ffc568589c New Crowdin Translations (automated) (#34211) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-19 08:16:25 +00:00
Claire 6f2979b0b0 Merge commit '547658f086b2bfb396f69822d7ba938e4c0caf80' into glitch-soc/merge-upstream 2025-03-18 22:03:50 +01:00
github-actions[bot]andGitHub Actions dc21104c04 New Crowdin Translations (automated) (#34178) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-18 14:49:53 +00:00
Claire e479626110 Merge commit '7866745a6bf21e5187137c321040ed58d37e4331' into glitch-soc/merge-upstream 2025-03-13 15:37:44 +01:00
github-actions[bot]andGitHub Actions 95dcd69542 New Crowdin Translations (automated) (#34157) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-13 12:55:17 +00:00
Claire b330cc21c4 Merge commit 'aff51823752b809c3349698b6be02bfdda7a9010' into glitch-soc/merge-upstream 2025-03-12 19:48:51 +01:00
github-actions[bot]andGitHub Actions fef446d22c New Crowdin Translations (automated) (#34136) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-12 12:51:16 +00:00
Claire fb55d09f77 Merge commit 'fb34d9c5909116d586a0187d86ada36ee1234f61' into glitch-soc/merge-upstream 2025-03-10 19:48:45 +01:00
github-actions[bot]GitHub ActionsClaire
 		207029eb2f New Crowdin Translations (automated) (#34043) 
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-10 09:45:11 +00:00
Claire dbd3e05812 Merge commit 'b57687083f4af178f2e2f43665eb4e49d32a50c2' into glitch-soc/merge-upstream 2025-03-07 17:37:36 +01:00
Claire b6f3cfb302 Merge commit 'e5655a5f65eb8116640ae434125553e0fe77f35e' into glitch-soc/merge-upstream 2025-03-06 20:10:00 +01:00
Eugen Rochko cadda2f957 Add effective date to terms of service (#33993) 2025-03-05 09:01:33 +00:00
github-actions[bot]andGitHub Actions 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]andGitHub Actions 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
github-actions[bot]andGitHub Actions 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]andGitHub Actions 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]andGitHub Actions 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]andGitHub Actions 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