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

1735 Commits

Author SHA1 Message Date
Claire
745c445e7e Merge commit 'e1dbbf6c9db6dbf3f356dae4c59fa05299372370' into glitch-soc/merge-upstream 2025-03-25 19:59:59 +01:00
github-actions[bot]
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]
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]
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]
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]
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]
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]
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]
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]
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]
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
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
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
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
github-actions[bot]
9692ffb911
New Crowdin Translations (automated) (#33847) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-06 10:53:56 +00:00
Claire
6ab5b9c790 Merge commit 'a9643cb7e77fd345b48877ed958d406403ad1b46' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-nightly.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
- `.github/workflows/build-push-pr.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
- `.github/workflows/build-releases.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
- `.github/workflows/build-security.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
 2025-02-05 18:21:36 +01:00
github-actions[bot]
7dca242795
New Crowdin Translations (automated) (#33835) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-05 08:53:32 +00:00
Claire
1dbeac2196 Merge commit '3b1ba46c93de63268d20104dee63374d0708deb0' into glitch-soc/merge-upstream 2025-02-04 18:38:41 +01:00
github-actions[bot]
c3e80784ee
New Crowdin Translations (automated) (#33825) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-04 09:39:07 +00:00
github-actions[bot]
a85a9f98d9
New Crowdin Translations (automated) (#33802) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-03 08:40:09 +00:00
Claire
c85616ee3a Merge commit 'f79b96a5ef0f6c4f57eee7f44ce2579b28a22098' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/feed_manager.rb`:
  Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
  Added upstream's code.
- `app/models/user_settings.rb`:
  Not a real conflict, glitch-soc has an extra setting textually-adjacent to a
  setting added upstream.
  Added upstream's setting.
- `app/serializers/initial_state_serializer.rb`:
  Same.
- `app/services/precompute_feed_service.rb`:
  Not a real conflict, glitch-soc has extra code for the direct feed.
  Added upstream's new code for populating lists.
 2025-02-01 19:07:13 +01:00
github-actions[bot]
91e4a09f24
New Crowdin Translations (automated) (#33795) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-31 08:09:02 +00:00
github-actions[bot]
3f4f6317d4
New Crowdin Translations (automated) (#33787) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-30 08:52:04 +00:00