7271a794d6
fix merge
2025-03-04 23:37:10 +00:00
1cdd91d6f1
Merge commit '6b519cfefa93a923b19d0f20c292c7185f8fd5f5' into glitch-soc/merge-upstream
2025-02-27 15:52:20 +01:00
cde3167d09
New Crowdin Translations (automated) ( #34009 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-02-27 09:36:16 +00:00
a682bd19f5
Merge commit '20531d1e078a27116dea53ce21c1b32bf3774eca' into glitch-soc/merge-upstream
2025-02-25 18:52:24 +01:00
ebde60ca82
Refactor `<Header>` into TypeScript ( #33956 )
2025-02-25 15:30:46 +00:00
33643c4c07
New Crowdin Translations (automated) ( #33996 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-02-25 13:08:40 +00:00
5a3fb4594b
New Crowdin Translations (automated) ( #33977 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-02-24 08:48:56 +00:00
524e8992ad
Merge commit 'db971976853103017b1561f2c4f9406fa00c0a2e' into glitch-soc/merge-upstream
2025-02-22 21:31:46 +01:00
2788808b07
New Crowdin Translations (automated) ( #33967 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-02-21 07:41:14 +00:00
12d0533bd7
Change "Specific people" to "Private mention" in menu in web UI ( #33963 )
2025-02-21 07:29:34 +00:00
70f8fb6d08
New Crowdin Translations (automated) ( #33960 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-02-19 08:17:23 +00:00
f3bc50778b
Merge commit 'f1d4be1e7509f795706ff2310c5fc36e0e79bf4d' into glitch-soc/merge-upstream
2025-02-18 20:38:57 +01:00
e2eceaf2fa
New Crowdin Translations (automated) ( #33949 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-02-18 10:23:53 +00:00
a3ef72a541
New Crowdin Translations (automated) ( #33933 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-02-17 09:22:13 +00:00
5cd80b7836
New Crowdin Translations (automated) ( #33925 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-02-14 08:38:48 +00:00
58a029335b
New Crowdin Translations (automated) ( #33918 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-02-13 10:50:09 +00:00
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
28d85ede4c
Merge commit '4fc8c6912979e8fd7882fb360b77e677ffd68565' into glitch-soc/merge-upstream
2025-02-12 18:40:21 +01:00
e918d4e3e8
New Crowdin Translations (automated) ( #33899 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-02-12 08:33:41 +00:00
0b4e5b64f9
New Crowdin Translations (automated) ( #33885 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-02-11 06:50:18 +00:00
83a271c003
Run optimize PNG on archetypes images ( #33882 )
2025-02-11 06:45:22 +00:00
804e6832d3
New Crowdin Translations (automated) ( #33861 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-02-10 10:10:38 +00:00
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
b7bc7cd087
New Crowdin Translations (automated) ( #33856 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-02-07 08:51:09 +00:00
9692ffb911
New Crowdin Translations (automated) ( #33847 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-02-06 10:53:56 +00:00
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
7dca242795
New Crowdin Translations (automated) ( #33835 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-02-05 08:53:32 +00:00
c59f879f30
[Glitch] Fix emoji rewrite adding unnecessary curft to the DOM for most emoji
...
Port 44f5f1f0a5
2025-02-04 18:41:09 +01:00
1dbeac2196
Merge commit '3b1ba46c93de63268d20104dee63374d0708deb0' into glitch-soc/merge-upstream
2025-02-04 18:38:41 +01:00
5212cd43ec
Change preview cards to be shown when Content Warnings are expanded ( #33827 )
2025-02-04 10:40:43 +00:00
c3e80784ee
New Crowdin Translations (automated) ( #33825 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-02-04 09:39:07 +00:00
44f5f1f0a5
Fix emoji rewrite adding unnecessary curft to the DOM for most emoji ( #33818 )
2025-02-03 13:43:45 +00:00
a85a9f98d9
New Crowdin Translations (automated) ( #33802 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-02-03 08:40:09 +00:00
a3399ed560
[Glitch] Add reminder when about to post without alt text in web UI
...
Port 1e70da5e3c
2025-02-01 19:58:11 +01:00
800bea7209
[Glitch] Add ability to dismiss alt text badge by tapping it in web UI
...
Port 796187c1e8
2025-02-01 19:10:32 +01:00
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
91e4a09f24
New Crowdin Translations (automated) ( #33795 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-31 08:09:02 +00:00
3f4f6317d4
New Crowdin Translations (automated) ( #33787 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-30 08:52:04 +00:00
796187c1e8
Add ability to dismiss alt text badge by tapping it in web UI ( #33737 )
2025-01-29 12:51:47 +00:00
1e70da5e3c
Add reminder when about to post without alt text in web UI ( #33760 )
2025-01-29 11:37:56 +00:00
73f599a99e
[Glitch] Change language detection debouncing behavior to refresh at least once every 1.5 seconds
...
Port 85668becde
2025-01-29 12:07:04 +01:00
2c97a59148
[Glitch] Add loading indicator to timeline gap indicators in web UI
...
Port 82183d8a79
2025-01-29 12:06:42 +01:00
844ae90dad
Merge commit '2beab34ca405a0beb3ea9f5ab684779dc2eb6374' into glitch-soc/merge-upstream
2025-01-29 12:05:09 +01:00
51bbca7723
Fix “x” hotkey not working on boosted filtered posts ( #33758 )
2025-01-29 10:15:32 +00:00
85668becde
Change language detection debouncing behavior to refresh at least once every 1.5 seconds ( #33770 )
2025-01-29 09:26:06 +00:00
82183d8a79
Add loading indicator to timeline gap indicators in web UI ( #33762 )
2025-01-29 08:46:04 +00:00
9c85825ac6
New Crowdin Translations (automated) ( #33766 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-29 08:38:53 +00:00
b740b17de5
Sync Glitch follow button with Mastodon ( #2957 )
...
Fixes the follow button saying "Follow back" when it actually will
cancel the follow request (mastodon/mastodon#31934 ). Intentionally omits
the "Mutual" state.
2025-01-28 21:22:19 +01:00
353e5f797c
Merge commit '5b291fcbe41564264954618fb1f4086a3be1c600' into glitch-soc/merge-upstream
...
Conflicts:
- `app/validators/poll_options_validator.rb`:
Upstream split `PollValidator` in two, and glitch-soc had local changes to
make the options configurable.
Refactored as upstream did, keeping glitch-soc's configurable limits.
2025-01-28 18:29:46 +01:00
80f72ee501
New Crowdin Translations (automated) ( #33753 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-28 09:40:50 +00:00
Holly
Claire
github-actions[bot]
Eugen Rochko
Matt Jankowski
wackbyte