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
e8672e27e8
Further remove old notifications code ( #33465 )
2025-01-06 18:22:07 +00:00
c692f69dba
Fix color contrast in report modal ( #33468 )
2025-01-06 16:24:32 +00:00
ae302d2f5a
[Glitch] Standalone share page: Dispatch fetchServer for maxChars ( #2929 )
2025-01-06 12:50:40 +01:00
612d6182e4
Fix `/share` not using server-set characters limit ( #33459 )
2025-01-06 08:14:11 +00:00
c93c1f38b7
New Crowdin Translations (automated) ( #33451 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-06 08:13:39 +00:00
53f8ac09f3
New Crowdin Translations (automated) ( #2920 )
...
* New Crowdin translations
* Update no.yml
* Update simple_form.no.yml
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2025-01-05 14:55:11 +01:00
0327db3db0
[Glitch] Refactor status `handleClick` and `handleHotkeyOpen` handlers
...
Port 9712518b2f
2025-01-04 15:30:32 +01:00
d878ca267c
[Glitch] Fix audio player modal having white-on-white buttons in light theme
...
Port 02fe176fd4
2025-01-04 15:29:56 +01:00
807bf8be24
Merge commit '9712518b2fb2585df3bcff95a687c291f04a4199' into glitch-soc/merge-upstream
2025-01-04 15:27:49 +01:00
9712518b2f
Refactor status `handleClick` and `handleHotkeyOpen` handlers ( #33435 )
2025-01-03 22:00:52 +00:00
02fe176fd4
Fix audio player modal having white-on-white buttons in light theme ( #33444 )
2025-01-03 21:51:51 +00:00
813921295e
[Glitch] Remove old notifications actions and reducers
...
Port 7d6da219c0
2025-01-03 20:54:09 +01:00
49c5791dec
[Glitch] Localize language names
...
Port f9582bcfc3
2025-01-03 20:29:08 +01:00
7e1f8babbd
Merge commit '7d6da219c0fccb8693282a99765135050173d7c4' into glitch-soc/merge-upstream
2025-01-03 20:26:28 +01:00
7d6da219c0
Remove old notifications actions and reducers ( #31843 )
2025-01-03 16:12:08 +00:00
f9582bcfc3
Localize language names ( #33402 )
2025-01-03 15:29:25 +00:00
04be5e7f12
[Glitch] Add `t` hotkey for post translations
...
Port 79a9069deb
2025-01-03 12:36:12 +01:00
68106f250c
Merge commit '6ffa251d6ad239d1ad2b95e784c3a7a21cbf50e8' into glitch-soc/merge-upstream
2025-01-03 12:34:47 +01:00
79a9069deb
Add `t` hotkey for post translations ( #33441 )
2025-01-03 09:24:50 +00:00
a8a16695f1
New Crowdin Translations (automated) ( #33439 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-03 07:53:00 +00:00
216b1fcd45
[Glitch] Fix favorite & bookmark text toggle in timeline, status and image view
...
Port 3201485df2
2025-01-02 22:08:43 +01:00
539fa40623
[Glitch] Fix keyboard shortcut for open status
...
Port a557f9bbaa
2025-01-02 21:16:56 +01:00
970eaae2f1
[Glitch] Fix processing of incoming notifications for unfilterable types
...
Port 655c4a5ebb
2025-01-02 21:16:01 +01:00
b9a32b0003
[Glitch] Fix WebUI erroneously stopping to offer expanding search results after second page
...
Port 68bfa7ae3f
2025-01-02 21:15:38 +01:00
cef665788a
Merge commit '8e3fd1b8236448f01221b1d7745736e50de51e11' into glitch-soc/merge-upstream
2025-01-02 21:14:14 +01:00
a557f9bbaa
Fix keyboard shortcut for open status ( #33419 )
2025-01-02 15:48:59 +00:00
3201485df2
Fix favorite & bookmark text toggle in timeline, status and image view ( #27209 )
2025-01-02 13:52:07 +00:00
655c4a5ebb
Fix processing of incoming notifications for unfilterable types ( #33429 )
2025-01-02 13:22:25 +00:00
68bfa7ae3f
Fix WebUI erroneously stopping to offer expanding search results after second page ( #33428 )
2025-01-02 10:58:00 +00:00
ba18289477
New Crowdin Translations (automated) ( #33378 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-02 09:02:47 +00:00
b7afca0f05
Change status content markup to match upstream ( #2923 )
...
* Remove option to have media outside of CWs
Upstream adopted the media-in-CW design glitch-soc originally had.
* Move poll to StatusContent
* Refactor status media icons
* Rename `forceFilter` to `showDespiteFilter` for consistency with upstream
* Change media and status content markup to match upstream's
* Add mention placeholders back
2024-12-29 19:59:19 +01:00
a6007ef5fa
Fix “Media“ local settings page being inaccessible ( #2922 )
2024-12-28 19:31:27 +01:00
c40016b785
[Glitch] Change search to use query params in web UI
...
Port 0636bcdbe1
2024-12-25 21:38:02 +01:00
168d14c920
[Glitch] Change design of interaction modal in web UI
...
Port f19fd0b889
2024-12-25 21:21:39 +01:00
2f9efb721c
[Glitch] Change animation on feed generation screen in web UI
...
Port 3cf6681736
2024-12-25 21:21:39 +01:00
e516066112
[Glitch] Fix long account username leaving container
...
Port 234af14966
2024-12-25 21:21:39 +01:00
e5dc03a353
[Glitch] Fix voting on polls
...
Port da279df8ae
2024-12-25 21:21:39 +01:00
9e7a7c713f
[Glitch] Change label of grouped favourite notification on private mentions
...
Port a4560d9278
2024-12-25 21:21:39 +01:00
37070a7881
[Glitch] Convert polls to Typescript / Immutable Records
...
Port ded799f913
2024-12-25 21:21:39 +01:00
967e095724
[Glitch] Fix Chromium showing scrollbar on embedded posts
...
Port 58c5068bda
2024-12-25 21:21:39 +01:00
bb17ffac92
[Glitch] Change referrer policy to be controlled by header in web UI
...
Port 425311e1d9
2024-12-25 21:21:39 +01:00
39ebf707f0
[Glitch] Fix missing top border on Admin Hashtags UI
...
Port 6615f17b48
2024-12-25 21:21:38 +01:00
cbe88a1e9c
[Glitch] Add terms of service
...
Port 30aa0df88c
2024-12-25 21:21:38 +01:00
1da3010ffd
[Glitch] Fix design of search bar on explore screen in light theme in web UI
...
Port bf79174829
2024-12-25 21:21:38 +01:00
0bf4d49166
[Glitch] Fix various visual sign-up flow issues
...
Port ca45f896dd
2024-12-25 21:21:38 +01:00
a8f6ed9776
[Glitch] Refactor `<HashtagHeader>` to TypeScript
...
Port 25387dc423
2024-12-25 21:21:38 +01:00
fb77bfb94d
[Glitch] Set unicode-bidi of account header content to plaintext in styles
...
Port b82c791770
2024-12-25 19:53:55 +01:00
6868b4481c
[Glitch] Add ability to search for all accounts when creating a list in web UI
...
Port 7135f513a4
2024-12-25 19:53:23 +01:00
062723cfb2
[Glitch] Change percentile label in year in review in web UI
...
Port 6cf87762a4
2024-12-25 19:38:57 +01:00
93631757b8
[Glitch] Provide option to force use of system scrollbar styling
...
Port 04b7046be1
2024-12-25 19:38:27 +01:00
14fe8c7d4b
[Glitch] Refactor `<Column>` to TypeScript
...
Port 346a27b6fc
2024-12-25 19:37:18 +01:00
0aa69487a2
Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
Not a real conflict, upstream added a setting textually close to a glitch-soc one.
Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
Not a real conflict, upstream added a setting textually close to a glitch-soc one.
Added upstream's new setting.
- `config/routes.rb`:
Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
an extra route.
Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
This spec got converted to a system spec upstream.
However, the theme setting works differently in glitch-soc, so the spec had been
changed.
Changed the corresponding system spec as well.
2024-12-25 18:01:37 +01:00
57c5905c19
Fix clicking on status prepends (“X boosted Y”) opening original account in a new tab ( #2919 )
2024-12-23 22:33:12 +01:00
76efddfc57
New Crowdin Translations (automated) ( #2907 )
...
* New Crowdin translations
* Fix bogus no.yml
* Fix bogus simple_form.no.yml
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-12-23 18:28:38 +01:00
5b93331a48
[Glitch] Fix middle-click handling conflicting with automatic scrolling
...
Port 9ff01403ea
2024-12-22 20:42:25 +01:00
d2fd51691a
[Glitch] Add ability to middle-mouse click posts in web UI
...
Port 683db3ab25
2024-12-22 20:39:23 +01:00
d65f6c2f8a
Replace glitch-soc's collapsed toots with upstream's “Read more” ( #2916 )
...
* Remove glitch-soc's post collapse feature
* Get rid of the infamous `parseClick`
* Remove unused CSS
* Use upstream's “Read More” implementation
* Update translation strings
2024-12-22 20:27:32 +01:00
dd56292d1f
New Crowdin Translations (automated) ( #33370 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-12-20 08:06:18 +00:00
7a08fe91b5
New Crowdin Translations (automated) ( #33358 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-12-19 08:47:20 +00:00
1992c2a4fa
New Crowdin Translations (automated) ( #33345 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-12-18 07:51:31 +00:00
f19fd0b889
Change design of interaction modal in web UI ( #33278 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-12-17 12:36:32 +00:00
02748f172d
New Crowdin Translations (automated) ( #33332 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-12-17 09:33:42 +00:00
a837f7d693
Fix clicking on a profile mention while logged out potentially leading to incorrect account ( #33324 )
2024-12-16 19:29:51 +00:00
504ea31bd3
New Crowdin Translations (automated) ( #33310 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-12-16 07:54:12 +00:00
3cf6681736
Change animation on feed generation screen in web UI ( #33311 )
2024-12-16 07:38:56 +00:00
7200f9d25c
New Crowdin Translations (automated) ( #33300 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-12-13 10:38:09 +00:00
234af14966
Fix long account username leaving container ( #33286 )
2024-12-13 08:41:38 +00:00
0636bcdbe1
Change search to use query params in web UI ( #32949 )
2024-12-12 17:12:33 +00:00
e0a49af47d
New Crowdin Translations (automated) ( #33280 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-12-12 09:10:00 +00:00
Claire