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
a3d2849d15
Fix `tootctl feeds build` not building list timelines ( #33783 )
2025-01-30 09:18:46 +00:00
3f4f6317d4
New Crowdin Translations (automated) ( #33787 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-30 08:52:04 +00:00
e53c8fbaf8
Fix `PollExpirationValidator` redundant check for `expires_at` presence ( #33777 )
2025-01-29 14:37:59 +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
6aa565b319
Fix missing button styles on some forms ( #33771 )
2025-01-29 10:36:24 +00: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
bd481204b5
Fix missing timeout options in `Request` class ( #33769 )
2025-01-29 08:42:20 +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
5b291fcbe4
Fix incorrect signature after HTTP redirect ( #33757 )
2025-01-28 14:44:27 +00:00
32aa83e9d7
Fix polls not being validated on edition ( #33755 )
2025-01-28 14:38:18 +00: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
93f3c724ae
Use `expect` in remaining controller locations ( #33748 )
2025-01-27 16:32:06 +00:00
e97335191d
Add hover cards to follow suggestions ( #33749 )
2025-01-27 16:24:41 +00:00
d3b637c757
Use `expect` in `Admin::ExportControllerConcern` import params ( #33745 )
2025-01-27 14:29:25 +00:00
65d9171c7d
Use `expect` for `admin/` controllers ( #33686 )
2025-01-27 14:05:16 +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
f73df1f2b0
Fix `Style/HashSlice` cop violations ( #33720 )
2025-01-24 16:57:55 +00:00
9a0166c3f3
Convert `LanguageDropdownMenu` to functional component ( #33704 )
2025-01-24 16:11:23 +00:00
a1d9c3fb99
Use `expect` params wrapper for more "auth" and "2FA" "controllers" ( #33717 )
2025-01-24 14:40:20 +00:00
e44b78413a
New Crowdin Translations (automated) ( #33711 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-24 09:06:25 +00:00
4b4de02fee
Remove broken link to Terms of Service when none are defined ( #33699 )
2025-01-23 14:34:30 +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
8eee7ae4c3
Fix issue with saving empty fields values on filter keyword updates ( #33691 )
2025-01-23 09:04:12 +00:00
4a9c49ee43
Fix issue with saving empty fields values on profile update ( #33689 )
2025-01-22 18:50:15 +00:00
8dcfd3f246
Fix WebUI crash when language detection code returns `undefined` ( #33683 )
2025-01-22 15:30:59 +00:00
607f65a0a5
Use `expect` for api/v1 and api/web push subs controllers ( #33682 )
2025-01-22 14:55:44 +00:00
b18caff5b6
Change `first_of_value` to `first_of_hash`, and add more test cases ( #33647 )
2025-01-22 14:02:05 +00:00
e155aab39e
Use `expect` for nested params in `settings/*` controllers ( #33673 )
2025-01-22 08:49:52 +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
d2cc28813f
Use `expect` for nested params in more controllers ( #33675 )
2025-01-22 08:35:34 +00:00
e380e803a8
Order emoji categories (in admin interface) by name ( #33630 )
2025-01-22 08:31:51 +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
3dcf5e12b1
Change notifications from moderators to not be filtered ( #33654 )
2025-01-21 11:39:53 +00: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
45149cd5e1
Use `expect` for nested params in `auth/setup#update` ( #33657 )
2025-01-21 08:16:40 +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
092e60eb7d
Change activity distribution error handling to skip retrying for deleted accounts ( #33617 )
2025-01-17 09:12:59 +00:00
a3baae0b99
API for updating attribution domains ( #32730 )
2025-01-17 08:18:55 +00:00
f6a0cd9d1a
Merge commit 'da4e55eb17e459fbc6d1a19fac3303508324324c' into glitch-soc/merge-upstream
2025-01-16 11:16:53 +01:00
da4e55eb17
Merge commit from fork
2025-01-16 11:10:08 +01:00
4a44c47982
New Crowdin Translations (automated) ( #33609 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-16 09:13:39 +00:00
3db8498903
Fix `Style/MutableConstant` cop ( #33602 )
2025-01-16 09:09:06 +00:00
998cf0dd53
Convert `auth/setup` spec controller->system/request ( #33604 )
2025-01-16 09:03:46 +00:00
ad71a8d1f7
Merge commit 'c20824fa760061cf8fba258dbbd6b0a615df4749' into glitch-soc/merge-upstream
2025-01-15 19:32:04 +01: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
68c9f91ccb
Treat non-null but blank account domain as local ( #33576 )
2025-01-14 17:40:55 +00:00
50013b10a5
Add `Status::Visibility` concern to hold visibility logic ( #33578 )
2025-01-14 14:32:57 +00: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
4a2813158d
Add support for standard webpush ( #33528 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2025-01-14 09:14:00 +00:00
ee4edbb94f
New Crowdin Translations (automated) ( #33582 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-14 08:44:58 +00:00
74da9e9281
Fix custom css cache miss ( #33583 )
2025-01-14 08:24:00 +00:00
77a44e61a8
Add enum validation to `DomainBlock#severity` ( #29158 )
2025-01-13 16:05:24 +00:00
f9451c5614
Fix issue with trending order when user has chosen languages ( #33557 )
2025-01-13 14:27:30 +00:00
0db7558822
Fix HTTP 500 on `POST /api/v1/admin/ip_blocks` ( #29308 )
2025-01-13 13:50:58 +00:00
Eugen Rochko
Claire
github-actions[bot]
wackbyte
Matt Jankowski
Jonathan de Jong
Christian Schmidt
Plastikmensch
S1m
Jeong Arm
Wolfgang
Daniel M Brasil