Matt Jankowski
2c6369918c
Fix `Style/RedundantArgument` cop ( #28321 )
2023-12-11 14:58:29 +00:00
Claire
f3864db409
Fix notification sounds ( #28316 )
2023-12-11 14:23:30 +00:00
github-actions[bot]
79a81da69c
New Crowdin Translations (automated) ( #28291 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-11 08:22:52 +00:00
Michael Stanclift
afc8550b63
Change preview card deletes to be done using batch method ( #28183 )
2023-12-11 07:49:10 +00:00
Claire
9f92b05bd2
Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated their README but we have a completely different one.
Kept our version of `README.md`
2023-12-10 18:05:02 +01:00
Claire
df5c64fe57
Further reduce differences with upstream
2023-12-09 21:19:43 +01:00
Claire
cc1d68ace8
[Glitch] Show announcements in reverse chronological order
...
Port f1f0400adc
and 8e2530ea16
to glitch-soc
Co-Authored-By: Darius Kazemi <darius.kazemi@gmail.com>
2023-12-09 21:19:43 +01:00
Claire
4b2ddaf106
Further reduce differences with upstream
2023-12-09 21:19:43 +01:00
Claire
408d4710ed
Further reduce differences with upstream
2023-12-09 20:58:50 +01:00
Claire
a27abb4802
Further reduce code differences with upstream ( #2509 )
2023-12-09 20:29:23 +01:00
Claire
1ddf2012ee
Fix status avatar size discrepancies ( #2510 )
...
Follow-up to #2508
2023-12-09 20:29:15 +01:00
Claire
b2647bc3f2
[Glitch] Update `Avatar`, `AvatarComposite`, and `AvatarOverlay` components ( #2508 )
...
Various ports including 8dfe5179ee
,
d1de7fb7fa
and
9f8d34620b
.
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: fusagiko / takayamaki <24884114+takayamaki@users.noreply.github.com>
2023-12-09 18:33:42 +01:00
github-actions[bot]
ca1b7efb06
New Crowdin Translations (automated) ( #28275 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-08 09:52:32 +00:00
Matt Jankowski
3918dc68c7
Use composite primary key for `PreviewCardsStatus` model ( #28208 )
2023-12-07 14:49:05 +00:00
Michael Stanclift
da3d8aff79
Error handling for attachment batch delete process ( #28184 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-12-07 14:40:44 +00:00
github-actions[bot]
e0dacf6b4c
New Crowdin Translations (automated) ( #28264 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-07 09:38:44 +00:00
Claire
7593465c23
Fix error when processing link preview with an array as `inLanguage` ( #28252 )
2023-12-07 09:05:08 +00:00
Matt Jankowski
ee83d5c760
Enable the eslint `react/no-unknown-property` rule ( #28217 )
2023-12-06 13:42:12 +00:00
github-actions[bot]
954169966b
New Crowdin Translations (automated) ( #28245 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-06 08:52:55 +00:00
github-actions[bot]
4238ec844d
New Crowdin Translations (automated) ( #28120 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-12-05 16:07:53 +00:00
Jonathan de Jong
d0a5ebf914
Fix error when encountering malformed Tag objects from Kbin ( #28235 )
2023-12-05 13:59:15 +00:00
Claire
9fcf5d4192
[Glitch] Fix emoji picker button scrolling with textarea content in single-column view ( #2501 )
...
Port bbea052935
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-04 13:30:27 +01:00
Essem
a46b6af1d6
Fix constant redirects to onboarding page ( #2505 )
2023-12-04 13:30:17 +01:00
Claire
a2bcfeb887
Fix `Style/HashEachMethods` cop in HAML files ( #28178 )
2023-12-04 09:09:43 +00:00
Claire
23ee393fdd
Merge pull request #2499 from ClearlyClaire/glitch-soc/port-toasts
...
Port upstream's toast changes
2023-12-03 20:57:42 +01:00
Eugen Rochko
cede2f533c
[Glitch] Fix toast saying "published" instead of "saved" after editing post in web UI
...
Port 71641766f2
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-03 19:39:08 +01:00
Renaud Chaput
9ac73a1fbf
[Glitch] Change `eslint` config to autofix missing comma and indentation in JS files
...
Partial port of 774e1189d2
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-03 16:44:40 +01:00
Christian Schmidt
ea004108b8
[Glitch] Make notification respect reduce-motion
...
Port 6d0767558a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-03 16:38:41 +01:00
Stanislas Signoud
811b8b200e
[Glitch] Use invariant colors on notification toasts
...
Port ca955ada0b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-03 16:38:41 +01:00
Eugen Rochko
3bbe39f233
[Glitch] Add toast with option to open post after publishing in web UI
...
Port a7ca33ad96
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-03 16:38:41 +01:00
Claire
046cb408b7
[Glitch] Fix front-end bug when processing relationship-related account actions
...
Port 287520453c
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-03 13:19:10 +01:00
Renaud Chaput
c3a0d5aca3
[Glitch] Fix Redux types
...
Port 0712cc2b99
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-03 13:19:10 +01:00
Renaud Chaput
6fb5fafd28
[Glitch] Convert `actions/account_notes` into Typescript
...
Port bd06c13204
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-03 13:19:10 +01:00
Claire
ee58f680e8
[Glitch] Fix autocomplete suggestions being cut off in compose form
...
Port 6833732852
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-03 11:23:12 +01:00
Claire
6269a5336f
[Glitch] Change composer highlight border size to be more noticeable
...
Port aa4c9730f6
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-03 11:23:12 +01:00
Claire
204fe83fcc
[Glitch] Fix compose textarea scroll behavior
...
Port 746979f75d
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-03 11:23:12 +01:00
Claire
a8f6a5b40f
Update translation strings
2023-12-03 11:23:12 +01:00
Claire
786b42e2b5
Fix SCSS and JS linting issues
2023-12-03 11:23:12 +01:00
Claire
a0943b8f6d
Remove glitch-soc's old onboarding modal
2023-12-03 11:23:12 +01:00
Renaud Chaput
6dc812dd51
[Glitch] Upgrade to react-router v5 in onboarding code
...
Port 1b70d7ed7c
to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-03 11:23:12 +01:00
Eugen Rochko
06e819537b
[Glitch] Change labels and styles on the onboarding screen in web UI
...
Port a985d587e1
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-03 11:23:12 +01:00
Eugen Rochko
d5bad93460
[Glitch] Change "Follow 7 people" to "Find at least 7 people to follow" in web UI
...
Port 4a5464f360
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-03 11:23:12 +01:00
たいち ひ
c2c25122e8
[Glitch] Rewrite <Check /> as FC
...
Port 6fdbee240c
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-03 11:23:12 +01:00
Renaud Chaput
a1667ba796
[Glitch] Upgrade react-intl usage in onboarding code
...
Port remaining of 44cd88adc4
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-03 11:23:12 +01:00
Claire
e47c582283
Fix import order
2023-12-03 11:23:12 +01:00
Renaud Chaput
ba4c8a9b41
[Glitch] Use the new JSX transform in onboarding code
...
Port the remaining of 8f66126b10
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-03 11:23:12 +01:00
Steven Munn
6e4497ab2d
[Glitch] Fix spelling of "Lets" on the onboarding page after clicking the confirmation email
...
Port 52d36f0f98
to glitch-soc
Co-authored-by: Steven Munn <stevenjmunn@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-03 11:23:12 +01:00
Emelia Smith
1cb8df655b
[Glitch] Fix Onboarding Errors
...
Port b8a2430642
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-03 11:23:12 +01:00
Renaud Chaput
0b1556b7f7
[Glitch] Enforce stricter rules for Typescript files
...
Port c8181eb0a4
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-03 11:23:12 +01:00
Eugen Rochko
542f2fb1e0
[Glitch] Add default post text to onboarding flow in web UI
...
Port 8979b70975
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-03 11:23:12 +01:00
Eugen Rochko
e0b401e295
[Glitch] Add more tips to onboarding flow in web UI
...
Port c35e3cb6ac
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-03 11:23:12 +01:00
Eugen Rochko
4537b4b961
[Glitch] Add new onboarding flow to web UI
...
Port 0461f83320
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-03 11:23:12 +01:00
Claire
335cfab32f
Change account note design to match upstream's ( #2495 )
2023-12-03 11:22:38 +01:00
Claire
f1241b4a3a
Fix translation string for `status.favourite` not having been changed everywhere ( #2494 )
2023-12-03 09:51:29 +01:00
Claire
edd96ce786
Merge pull request #2492 from ClearlyClaire/glitch-soc/painful-backports
...
Port account rows design change from upstream
2023-12-03 09:51:07 +01:00
Claire
21df2a68ac
Hide followers count when hidden by instance or user
2023-12-02 17:38:07 +01:00
Claire
09062d393f
Fix more styling issues
2023-12-02 17:38:07 +01:00
Claire
28d4f3ab70
Fix account component styling wrt. upstream
2023-12-02 17:05:54 +01:00
fusagiko / takayamaki
dc917cfcdf
[Glitch] Fix account.jsx imports ( #25541 )
...
Port remaining part of e0d230fb37
,
20e85c0e83
and
9d45a444f9
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-02 16:59:40 +01:00
Eugen Rochko
17372a3ec0
[Glitch] Change labels and styles on the onboarding screen in `Account` component
...
Partial port of a985d587e1
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-02 16:59:40 +01:00
Eugen Rochko
0421b44f22
[Glitch] Change follow button in account row to be more obvious in web UI ( #24956 )
...
Port 0ddc895282
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-02 16:59:40 +01:00
Claire
f1691eca55
[Glitch] Fix overflow behavior of account rows
...
Port 5fae2de454
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-02 16:59:40 +01:00
Renaud Chaput
98a7b95058
[Glitch] Update inconsistent `defaultMessage` in `Account` component
...
Partial port of e58c36d308
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-02 16:59:40 +01:00
Claire
b047b981cd
[Glitch] Enforce import order with ESLint
...
Port d27216dc46
to glitch-soc
2023-12-02 16:59:40 +01:00
Emelia Smith
b8cbaba283
[Glitch] Split `EmptyAccount` out of `Account` component
...
Partial port of b8a2430642
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-02 16:59:40 +01:00
Claire
32ec0d2472
[Glitch] Fix verified badge in account lists potentially including rel="me" links
...
Port 55e7c08a83
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-02 16:59:40 +01:00
Renaud Chaput
e7ec2641a0
[Glitch] Fix linting issues with VerifiedBadge component
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-02 16:59:40 +01:00
fusagiko / takayamaki
2efb22f455
[Glitch] Rewrite VerifiedBadge component as function component
...
Port 140aa6b054
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-02 16:59:40 +01:00
Eugen Rochko
00db5c8ade
[Glitch] Split VerifiedBadge from Account component
...
Partial port of 0461f83320
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-02 16:59:40 +01:00
Eugen Rochko
e0aba64a64
[Glitch] Fix regressions from change in account row design in web UI
...
Port 46483ae849
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-02 16:59:40 +01:00
Eugen Rochko
a262f990f8
Change design of account rows in web UI ( #24247 )
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-02 16:59:40 +01:00
Claire
73a94c3b3f
Fix self-destruct page not using theme styles ( #2490 )
2023-12-02 14:54:35 +01:00
Plastikmensch
5b0382abc5
Remove redundant asset preload ( #2488 )
...
* Remove redundant asset preload
preloading these is already handled by glitch-soc theming system, meaning glitch packs get preloaded and if the user is signed in, vanilla packs.
The theming system preloads these unconditionally though.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Remove preload of getting started
This matches upstreams preloads
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-12-02 14:54:26 +01:00
Matt Jankowski
3bc437b99a
Fix `Style/RedundantParentheses` cop ( #28176 )
2023-12-01 16:00:44 +00:00
Matt Jankowski
5631f139c1
Fix `Lint/SymbolConversion` cop ( #28175 )
2023-12-01 15:53:35 +00:00
Matt Jankowski
d83d01eb1e
Fix `Lint/RedundantSafeNavigation` cop ( #28172 )
2023-12-01 15:52:56 +00:00
Matt Jankowski
f70f39dd04
Add explicit `dependent: nil` to associations ( #28169 )
2023-12-01 15:52:47 +00:00
Matt Jankowski
440b80b2e7
Model concerns organization into module namespaces ( #28149 )
2023-12-01 11:00:41 +00:00
Claire
963354978a
Add `Account#unavailable?` and `Account#permanently_unavailable?` aliases ( #28053 )
2023-11-30 15:43:26 +00:00
Matt Jankowski
35deaaf90b
Reduce AbcSize complexity in `InitialStateSerializer` ( #27782 )
2023-11-30 15:41:26 +00:00
Matt Jankowski
1f1c75bba5
File cleanup/organization in `controllers/concerns` ( #27846 )
2023-11-30 14:39:41 +00:00
Matt Jankowski
e7c340a634
Spec coverage for missing `q` param and error conditions in `api/v2/search` controller ( #27842 )
2023-11-30 13:59:46 +00:00
Claire
b20af17a2c
Fix onboarding step descriptions being truncated on narrow screens ( #28021 )
2023-11-30 13:47:07 +00:00
Claire
85662a5a57
Change `img-src` and `media-src` CSP directives to not include `https:` ( #28025 )
2023-11-30 13:47:01 +00:00
Matt Jankowski
bb0efe16e6
Remove `default_scope` from `MediaAttachment` class ( #28043 )
2023-11-30 13:30:35 +00:00
Claire
7faa27e17d
Change dismissed banners to be stored server-side ( #27055 )
2023-11-30 11:45:54 +00:00
Matt Jankowski
e48ecd2929
Remove `default_scope` from `Admin::ActionLog` ( #28026 )
2023-11-29 10:39:59 +00:00
Matt Jankowski
291dc04e67
Remove un-needed `action` and `template` options to `render` in controllers ( #28022 )
2023-11-29 10:38:05 +00:00
Matt Jankowski
72b7cd349c
Extract helper methods for form label in admin/ area views ( #27575 )
2023-11-29 10:06:19 +00:00
Matt Jankowski
9b47c5d53c
Extract helper methods for labels from filters/_filter_fields ( #27574 )
2023-11-29 10:02:59 +00:00
Matt Jankowski
186895fc88
Refactor, lint fix, and bug fix on admin/roles/form partial ( #27558 )
2023-11-29 10:00:52 +00:00
Emelia Smith
603b245cc6
Add VAPID public key to instance serializer ( #28006 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-11-29 08:34:36 +00:00
Matt Jankowski
6b46bf9953
Handle scenario when webfinger response `subject` is missing host value ( #28088 )
2023-11-28 18:37:54 +00:00
Josh Goldberg ✨
3a7f10c3f1
Converted hashtag.jsx to TypeScript ( #27872 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-11-28 18:20:10 +00:00
Josh Goldberg ✨
1142f4c79e
Converted app/javascript/mastodon/utils/ folder to TypeScript ( #27895 )
2023-11-28 17:47:55 +00:00
Matt Jankowski
baf3b71e3b
Extract `path_without_format` private methd in accounts controller ( #28091 )
2023-11-28 09:17:26 +00:00
github-actions[bot]
af02484714
New Crowdin Translations (automated) ( #28096 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-28 08:59:48 +00:00
Matt Jankowski
9072896ae5
Avoid unnecessary i-var for account rss page url generation ( #28092 )
2023-11-28 08:19:08 +00:00
Matt Jankowski
dfc7154767
Remove unused `cached_filtered_status_page` method from accounts controller ( #28090 )
2023-11-28 07:43:16 +00:00
Matt Jankowski
2d536bb05f
Use `admin_mailer` layout with initial salutation ( #28085 )
2023-11-28 07:41:26 +00:00