djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-03-02 22:41:42 -05:00
Code Issues Packages Projects Releases Wiki Activity
24,501 Commits 70 Branches 23 Tags 375 MiB
Commit Graph

14589 Commits

Author SHA1 Message Date
Claire
1cdd91d6f1 Merge commit '6b519cfefa93a923b19d0f20c292c7185f8fd5f5' into glitch-soc/merge-upstream 2025-02-27 15:52:20 +01:00
Jeremy Kescher
6b519cfefa
Merge commit from fork 
* Fix domain blocks/rationales being visible to unapproved/unconfirmed users

* Fix domain blocks/rationales being visible to suspended users

Co-authored-by: Claire <claire.github-309c@sitedethib.com>

* Allow moved users to view domain blocks

* Add authorization specs for `/api/v1/instance/domain_blocks` spec

* Fix tests

* Fix incorrect test setup

---------

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-02-27 15:49:57 +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
Claire
20531d1e07
Fix GET /api/v2/notifications/:id and POST /api/v2/notifications/:id/dismiss for ungrouped notifications (#33990) 2025-02-25 14:37:44 +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
Eugen Rochko
298ca53593
Add choice of law to terms of service generator (#33994) 2025-02-25 10:58:11 +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
Matt Jankowski
d75c4bf53e
Update rubocop to version 1.72.2 and use plugins configuration style (#33946) 2025-02-18 08:25:41 +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
Claire
1248c4d1f4
Fix handling of duplicate mentions in incoming status Update (#33911) 2025-02-12 15:34:56 +00:00
Claire
6b52227fcc
Fix Mastodon listing updates older or equal to current version (#33906) 2025-02-12 14:27:42 +00:00
Claire
db59f37269
Fix redirect after log-in when allow_referrer_origin setting is enabled (#33903) 2025-02-12 12:58:48 +00:00
Nicholas La Roux
7a50fd8849
Migrate BlockDomainService notification job enqueueing to Sidekiq's perform_bulk for efficiency (#33897) 2025-02-12 12:48:09 +00: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
Claire
1cf30717db
Fix potential inefficiency in media privacy system check (#33858) 2025-02-07 10:22:59 +00: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
9e164c532f
Add --skip-filled-timeline option to tootctl feed build to skip half-filled feeds (#33844) 2025-02-06 09:38:32 +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
Claire
334d306ccc
Fix filtering for lists (#33842) 2025-02-05 15:08:12 +00:00
Claire
1be5269151
Optimize timeline generation (#33839) 2025-02-05 14:02:39 +00:00
Matt Jankowski
c3419d146a
Remove duplicate cache header setting before action (#33833) 2025-02-05 09:19:08 +00: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
c59f879f30 [Glitch] Fix emoji rewrite adding unnecessary curft to the DOM for most emoji 
Port 44f5f1f0a56b0da1a7f333b641d0b1c6474860be to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-02-04 18:41:09 +01:00
Claire
1dbeac2196 Merge commit '3b1ba46c93de63268d20104dee63374d0708deb0' into glitch-soc/merge-upstream 2025-02-04 18:38:41 +01:00
Claire
5212cd43ec
Change preview cards to be shown when Content Warnings are expanded (#33827) 2025-02-04 10:40:43 +00: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
Claire
5553941666
Drop custom scopes conversion code from /settings/applications controller (#33819) 2025-02-04 09:31:42 +00:00
Claire
44f5f1f0a5
Fix emoji rewrite adding unnecessary curft to the DOM for most emoji (#33818) 2025-02-03 13:43:45 +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
cf820b2eca
Fix /settings/applications rejecting scopes parameter (#33798) 2025-02-02 21:11:32 +00:00
Eugen Rochko
a3399ed560 [Glitch] Add reminder when about to post without alt text in web UI 
Port 1e70da5e3c279c8e632abb6bdf90b1ddc67b035e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-02-01 19:58:11 +01:00
Eugen Rochko
800bea7209 [Glitch] Add ability to dismiss alt text badge by tapping it in web UI 
Port 796187c1e8a387d94892e39cc8b897866e616d4d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-02-01 19:10:32 +01: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