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
e736363e77
[Glitch] Add hover cards to follow suggestions
...
Port e97335191d
2025-01-27 18:21:56 +01:00
560eaff2c4
[Glitch] Remove system tooltip for alt text in web UI
...
Port 956873362e
2025-01-27 18:21:36 +01:00
a21f35786d
[Glitch] Fix color of language indicator in light theme in web UI
...
Port 81271a18c5
2025-01-27 18:20:58 +01:00
12bdf58db4
[Glitch] Refactor `<LanguageDropdown>` into TypeScript
...
Port 52a5c8ae05
2025-01-27 18:20:37 +01:00
75e304d0c9
[Glitch] Convert `LanguageDropdownMenu` to functional component
...
Port 9a0166c3f3
2025-01-27 18:20:00 +01:00
17af994a05
[Glitch] Add information about alt text to alt text modal in web UI
...
Port 0885c31633
2025-01-27 18:20:00 +01:00
c14c553c7e
[Glitch] Convert `LanguageDropdown` to a functional component
...
Port db146046c4
2025-01-27 18:20:00 +01:00
fcc5262f60
Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/system/settings/preferences/appearance_spec.rb`:
Upstream tests for changing themes in there, but glitch-soc has
its own place for that.
Updated upstream's change while skipping the theme test.
2025-01-27 18:19:09 +01:00
e97335191d
Add hover cards to follow suggestions ( #33749 )
2025-01-27 16:24:41 +00:00
b53bf23df0
New Crowdin Translations (automated) ( #33731 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-27 08:39:56 +00:00
956873362e
Remove system tooltip for alt text in web UI ( #33736 )
2025-01-27 08:17:59 +00:00
81271a18c5
Fix color of language indicator in light theme in web UI ( #33724 )
2025-01-27 08:08:31 +00:00
52a5c8ae05
Refactor `<LanguageDropdown>` into TypeScript ( #33723 )
2025-01-27 08:06:33 +00:00
2df86d6413
Fix wrong styles on rules and buttons in the sign-up form ( #33725 )
2025-01-24 22:20:05 +00:00
9a0166c3f3
Convert `LanguageDropdownMenu` to functional component ( #33704 )
2025-01-24 16:11:23 +00:00
e44b78413a
New Crowdin Translations (automated) ( #33711 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-24 09:06:25 +00:00
1b2c952471
New Crowdin Translations (automated) ( #33697 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-23 13:36:03 +00:00
0885c31633
Add information about alt text to alt text modal in web UI ( #33702 )
2025-01-23 13:01:11 +00:00
db146046c4
Convert `LanguageDropdown` to a functional component ( #33701 )
2025-01-23 12:54:23 +00:00
45093e7abf
[Glitch] Fix language detection taking mentions and URLs into account
...
Port 3178acc5cb
2025-01-23 13:40:00 +01:00
38905ae658
[Glitch] Fix WebUI crash when language detection code returns `undefined`
...
Port 8dcfd3f246
2025-01-23 13:38:35 +01:00
bfb9092890
[Glitch] Refactor `<DomainPill>` into TypeScript
...
Port 8b24085f8e
2025-01-23 13:38:35 +01:00
19fa4cfcf2
Merge commit '3178acc5cb8415a72b646dbe77be05255d3966f3' into glitch-soc/merge-upstream
2025-01-23 13:38:23 +01:00
3178acc5cb
Fix language detection taking mentions and URLs into account ( #33700 )
2025-01-23 10:25:14 +00:00
8dcfd3f246
Fix WebUI crash when language detection code returns `undefined` ( #33683 )
2025-01-22 15:30:59 +00:00
8b24085f8e
Refactor `<DomainPill>` into TypeScript ( #33680 )
2025-01-22 08:39:13 +00:00
38c27a7708
New Crowdin Translations (automated) ( #33679 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-22 08:35:41 +00:00
5e7c079787
[Glitch] Change design of edit media modal in web UI
...
Port 11786f1114
2025-01-21 19:43:38 +01:00
05e5db91c7
Merge commit '3dcf5e12b1ffb8e57a7c1e1f3f1145c9bae477e8' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
Conflict because one of the removed lines was modified to accomodate for
glitch-soc's slightly different build system.
Removed the lines as upstream did.
2025-01-21 19:23:25 +01:00
11786f1114
Change design of edit media modal in web UI ( #33516 )
2025-01-21 11:34:22 +00:00
785543b5a6
[Glitch] Fix opening modals losing some location parameters
...
Port 4ebdfed8ea
2025-01-21 12:07:40 +01:00
ce7fb94306
Merge commit '4ebdfed8ea7d16d203da73051ef26bbcdeb63681' into glitch-soc/merge-upstream
2025-01-21 12:06:49 +01:00
4ebdfed8ea
Fix opening modals losing some location parameters ( #33670 )
2025-01-21 09:53:52 +00:00
9e90248abc
New Crowdin Translations (automated) ( #33668 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-21 08:37:53 +00:00
89b7f8884a
[Glitch] Add warning when selected and detected language is different in web UI
...
Port 8962f11578
2025-01-20 18:07:59 +01:00
08e7c4f3a7
Merge commit '7f866daf637e9303c7b503e0ed29ef8802fcb4c0' into glitch-soc/merge-upstream
2025-01-20 18:06:13 +01:00
8962f11578
Add warning when selected and detected language is different in web UI ( #33042 )
2025-01-20 09:17:13 +00:00
329a9e1ac1
New Crowdin Translations (automated) ( #33643 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-20 08:59:23 +00:00
297eb7c956
Merge commit '4bd969e4bb54297981d385903bf8a4348b394f09' into glitch-soc/merge-upstream
...
Conflicts:
- `CONTRIBUTING.md`:
Upstream modified it while we quote upstream's within an otherwise different file.
Applied upstream's changes.
2025-01-18 12:42:17 +01:00
1c23ebd62f
New Crowdin Translations (automated) ( #33626 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-17 10:05:41 +00:00
f6a0cd9d1a
Merge commit 'da4e55eb17e459fbc6d1a19fac3303508324324c' into glitch-soc/merge-upstream
2025-01-16 11:16:53 +01:00
4a44c47982
New Crowdin Translations (automated) ( #33609 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-16 09:13:39 +00:00
e489410b0f
Fix attachment list in conversation component ( #2941 )
...
`media` is no longer part of `StatusContent`, so the attachment list wasn't shown in the private mentions column.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2025-01-15 08:18:39 +01:00
5395154832
Fix media attachments in report modal
...
Media attachments weren't shown in the report modal since they were passed as `media` to `StatusContent`, but `StatusContent` doesn't use the media prop anymore.
Instead match the file with vanilla.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2025-01-14 23:47:09 +01:00
09bd5aa156
[Glitch] Redirect new users to onboarding
...
Port e9462960a7
2025-01-14 20:47:40 +01:00
563ff91cf8
[Glitch] Use final specification for new WebPush subscriptions in web interface
...
Port e2f085e2b2
2025-01-14 20:46:21 +01:00
ab152ebed4
Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/status.rb`:
Upstream refactored `visibility` handling to a concern, while glitch-soc had
custom code adjacent to some of the changed lines.
Applied upstream's changes.
- `lib/mastodon/version.rb`:
Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's
default github repository had been modified.
Applied upstream's changes and updated `config/mastodon.yml` accordingly.
2025-01-14 20:38:32 +01:00
e9462960a7
Redirect new users to onboarding ( #33471 )
2025-01-14 13:10:48 +00:00
e2f085e2b2
Use final specification for new WebPush subscriptions in web interface ( #33587 )
2025-01-14 10:42:06 +00:00
ee4edbb94f
New Crowdin Translations (automated) ( #33582 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-14 08:44:58 +00:00
50449ae7ac
Fix media preview height in compose form when 3 or more images are attached ( #33571 )
2025-01-13 11:48:47 +00:00
53885b0fdb
New Crowdin Translations (automated) ( #33559 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-13 09:13:47 +00:00
0270bd2ee5
[Glitch] Require specific subtype of `formatMessage` in `timeAgoString`
...
Port 6b1ea8dd2c
2025-01-10 20:56:20 +01:00
00f410a089
[Glitch] Fix use of deprecated `Iterable.isIndexed` from immutable
...
Port 1bf6195763
2025-01-10 20:55:27 +01:00
fb48fc4cce
[Glitch] Include time portion in formatted datetimes when provided
...
Port JS part of 15669fcf75
2025-01-10 20:53:48 +01:00
19b9884bb2
[Glitch] Fix preview card sizing in “Author attribution” in profile settings
...
Port 82e046ea06
2025-01-10 20:53:12 +01:00
155dc4bc4b
Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream
...
Conflicts:
- `CONTRIBUTING.md`:
Upstream changed the file, while we had a different one.
Updated the common parts.
- `README.md`:
Upstream changed the file, while we had a different one.
Updated the common parts.
- `app/helpers/application_helper.rb`:
Upstream added helpers where glitch-soc had extra ones.
Added upstream's new helpers.
- `app/models/form/admin_settings.rb`:
Upstream added some custom handling of one setting, while
glitch-soc had additional code.
Ported upstream's code.
- `lib/mastodon/version.rb`:
Upstream moved some things to `config/mastodon.yml`.
Did the same.
- `spec/requests/api/v1/accounts/credentials_spec.rb`:
I don't know honestly.
2025-01-10 20:41:36 +01:00
846c89b66e
New Crowdin Translations (automated) ( #33541 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-10 09:00:41 +00:00
a8b2b474d7
Add timestamp to all announcements in Web UI ( #18329 )
2025-01-09 14:22:33 +00:00
4e2c15b45d
New Crowdin Translations (automated) ( #33522 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-09 08:21:47 +00:00
10e24113a8
Fix issue with “Translate” button being overlayed on text ( #2935 )
...
Fixes #2932
2025-01-08 18:25:09 +01:00
dc14695f8a
Fix extraneous margins below CW in absence of mentions ( #2936 )
2025-01-08 18:24:57 +01:00
6b1ea8dd2c
Require specific subtype of `formatMessage` in `timeAgoString` ( #33511 )
2025-01-08 16:26:54 +00:00
1bf6195763
Fix use of deprecated `Iterable.isIndexed` from immutable ( #33510 )
2025-01-08 16:25:41 +00:00
15669fcf75
Include time portion in formatted datetimes when provided ( #33191 )
2025-01-08 14:26:08 +00:00
35e57138f1
New Crowdin Translations (automated) ( #33500 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-08 09:01:28 +00:00
82e046ea06
Fix preview card sizing in “Author attribution” in profile settings ( #33482 )
2025-01-07 11:29:38 +00:00
9715bd796f
New Crowdin Translations (automated) ( #33480 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-07 07:50:27 +00:00
412a0dd661
[Glitch] Further remove old notifications code
...
Port e8672e27e8
2025-01-06 20:40:26 +01:00
32567a6d8d
[Glitch] Fix color contrast in report modal
...
Port c692f69dba
2025-01-06 20:40:06 +01:00
126ce9a232
Merge commit '82d2ce293d98a2b9e024bc5396c3586904d46ae5' into glitch-soc/merge-upstream
2025-01-06 20:36:25 +01:00
github-actions[bot]
Claire
Eugen Rochko
wackbyte
Plastikmensch
Emelia Smith