Commit Graph

6447 Commits (b3fc8aacd94b9cbe29670f67e494798cf816a84a)

Author SHA1 Message Date
Claire 60762fb8ba [Glitch] Add card with who invited you to join when displaying rules on sign-up
Port SCSS from c7a8838bd7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-10 16:30:36 +02:00
Jed Fox 2877b12754 [Glitch] Fix spacing of middle dots in the detailed status meta section
Port 2d2750c6a9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-10 16:29:48 +02:00
Claire 085a1197da Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/simple_form.rb`:
  Upstream added a new simple_form component, where we had an extra one.
  Kept both components.
2023-06-10 16:22:14 +02:00
Renaud Chaput 333c28ce6d [Glitch] Fix `/share` and cleanup and reorganize frontend locale loading
Port 29851c83bd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-10 16:18:01 +02:00
Claire 3b87fe21fa Merge commit '29851c83bd518f7fe8ba44cf0c550c57047ddfa4' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/load_locale.js`:
  The file moved to `app/javascript/mastodon/locales/load_locale.ts`.
  Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`.
- `app/javascript/mastodon/locales/index.js`:
  The file moved to `app/javascript/mastodon/locales/index.ts`.
  Did *not* port the changes as I want to try something a bit different.
2023-06-10 15:32:29 +02:00
S.H 7ccf99b652 [Glitch] Fix using Date.now() instead of intl.now()
Port 4e28b89f51 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-10 15:21:04 +02:00
Claire e6b6a0535e Merge commit 'a82f0363091618ddd94c76bdd36bf05f74428eee' into glitch-soc/merge-upstream 2023-06-10 15:17:08 +02:00
Claire fd0b9c9881 [Glitch] Add a confirmation screen when suspending a domain
Port 8ee98cfd2b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-10 15:10:24 +02:00
Claire 13b84da439 Merge commit '8ee98cfd2b01d96222c1559f35ef8b82732af620' into glitch-soc/merge-upstream 2023-06-10 15:09:19 +02:00
Renaud Chaput 5715cd6b8a [Glitch] Fix prev/next buttons color in media viewer
Port 40e756f291 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-10 14:48:41 +02:00
Christian Schmidt 8b958c0858 [Glitch] Translate CW, poll options and media descriptions
Port 971eafc709 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-10 14:48:41 +02:00
Claire 447b44a5d6 Merge commit '52b4e33d7fca20663e95e943631087d728bee3f6' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Upstream changed various script definitions in lines surrounding the one for
  `i18n:extract`, which had glitch-soc-specific changes.
  Updated the scripts as upstream did, while keeping our changes to
  `i18n:extract`.
2023-06-10 14:38:04 +02:00
Renaud Chaput b428d82286 [Glitch] Upgrade react-intl
Port 76960f128a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-10 14:37:08 +02:00
Claire c22b032483 Merge commit '76960f128a764f5105c076813d8ffaa0df985dda' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, but we've deleted it.
  Keep it deleted.
- `app/javascript/mastodon/locales/index.js`:
  Reworked upstream, but the code was mostly in
  `app/javascript/locales/index.js` in glitch-soc.
  Updated that file accordingly.
- `app/javascript/packs/public.jsx`:
  Not a real conflict, but different imports in
  glitch-soc and upstream.
- `app/views/layouts/application.html.haml`:
  Conflict due to locales loading and theme system
  discrepancies.
  Updated in our own way.
- `app/views/layouts/embedded.html.haml`:
  Conflict due to locales loading and theme system
  discrepancies.
  Updated in our own way.
- `config/webpack/generateLocalePacks.js`:
  Deleted upstream, as upstream now directly loads the
  JSON at runtime.
  Deleted as well, will switch to runtime loading in
  an upcoming commit.
- `config/webpack/shared.js`:
  Not a real conflict, but different imports in
  glitch-soc and upstream.
- `config/webpack/translationRunner.js`:
  Mostly deleted upstream, to be replaced with `formatjs-formatter.js`
  instead.
  Moved the glitch-soc logic there and deleted the file.
2023-06-10 12:38:33 +02:00
Eugen Rochko 66a5173629 Add `legal` as report category (#23941) 2023-06-06 23:41:59 +02:00
Eugen Rochko 7abfddd8a5 Change design of dropdowns in web UI (#25107) 2023-06-06 21:49:49 +02:00
alfe f9c819e8db Rewrite `<LoadMore />` as FC and TS (#25259) 2023-06-06 11:28:50 +02:00
Claire 51046cb4db Fix autocomplete suggestions being cut off in compose form (#25275) 2023-06-06 11:05:25 +02:00
Eugen Rochko 8f34072fc0 Change follow button in account row to be more obvious in web UI (#24956) 2023-06-06 04:14:28 +02:00
Claire 21f904b344 Add data-nosnippet so Google doesn't use trending posts in snippets for / (#25279) 2023-06-05 17:32:24 +02:00
S.H 94f9888d57 Fix not shown announcements in hometimeline. (#25251) 2023-06-05 14:49:51 +02:00
dependabot[bot] d6feba366b [Glitch] Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0
Port 9ba1135000 to glitch-soc

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-05 13:31:45 +02:00
Claire cd107b054d [Glitch] Fix `null` signUp URL in various places
Port 75ebb60ef6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-05 13:28:22 +02:00
y.takahashi e7cb0dc83b [Glitch] Handle Surrogate Pairs in truncate()
Port 5c744a5d7d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-05 13:28:02 +02:00
Claire bda5be1406 Merge commit '68296cfb32f6ab7baf5c8400b2bdb261d6aa3694' into glitch-soc/merge-upstream
Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's changes.
2023-06-05 13:25:22 +02:00
Claire 4c2503d36c Fix design issues with recent react-intl upgrade (#25272) 2023-06-05 09:52:36 +02:00
Darius Kazemi 6debddcf89 Add exclusive lists (#22048)
Co-authored-by: Liam Cooke <liam@liamcooke.com>
Co-authored-by: John Holdun <john@johnholdun.com>
Co-authored-by: Effy Elden <effy@effy.space>
Co-authored-by: Lina Reyne <git@lina.pizza>
Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-05 09:37:02 +02:00
Eugen Rochko c4426198c3 Change "Follow 7 people" to "Find at least 7 people to follow" in web UI (#24954) 2023-06-05 01:42:17 +02:00
Claire 85e0bd73cf Fix closeModal invocation (#2239)
Fixes #2238

Some call sites where missed in 62f386d44e
2023-06-04 22:05:45 +02:00
Claire c7a8838bd7 Add card with who invited you to join when displaying rules on sign-up (#23475) 2023-06-02 18:35:37 +02:00
Jed Fox 2d2750c6a9 Fix spacing of middle dots in the detailed status meta section (#25247) 2023-06-02 15:40:23 +02:00
Renaud Chaput 29851c83bd Fix `/share` and cleanup and reorganize frontend locale loading (#25240) 2023-06-02 15:00:27 +02:00
Claire a82f036309 Fix overflow behavior of account rows (#25131) 2023-06-01 14:47:55 +02:00
S.H 4e28b89f51 Fix using Date.now() instead of intl.now() (#25234) 2023-06-01 13:46:19 +02:00
Claire 8ee98cfd2b Add a confirmation screen when suspending a domain (#25144) 2023-06-01 09:37:38 +02:00
Renaud Chaput 40e756f291 Fix prev/next buttons color in media viewer (#25231) 2023-06-01 02:25:38 +02:00
Christian Schmidt 971eafc709 Translate CW, poll options and media descriptions (#24175)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-01 00:10:21 +02:00
Renaud Chaput 76960f128a Upgrade react-intl (#24906) 2023-05-31 23:43:39 +02:00
dependabot[bot] 9ba1135000 Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0 (#25172)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-05-31 09:27:21 +02:00
Claire 75ebb60ef6 Fix `null` signUp URL in various places (#25190) 2023-05-30 19:01:42 +02:00
y.takahashi 5c744a5d7d Handle Surrogate Pairs in truncate() (#25148) 2023-05-29 11:55:16 +02:00
Claire 615a7d5795 Fix extraneous newlines 2023-05-28 18:06:09 +02:00
fusagiko / takayamaki 62f386d44e [Glitch] Rewrite actions/modal and reducers/modal with typescript
Port a19c1671af to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-28 17:49:55 +02:00
たいち ひ cd0ff98425 [Glitch] Fix export style of `<LoadGap />` based on `<Domain />`
Port ae0341c203 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-28 17:15:21 +02:00
Renaud Chaput f58504f2c7 [Glitch] Update inconsistent `defaultMessage`
Port 169f141c4c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-28 17:14:31 +02:00
Claire 53b8a15ee9 Merge branch 'main' into glitch-soc/merge-upstream 2023-05-28 17:01:25 +02:00
Eugen Rochko 2592015ce6 [Glitch] Change share action from being in action bar to being in dropdown in web UI
Port 97235baa4f to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-28 16:59:12 +02:00
Renaud Chaput b17b1827e7 [Glitch] Fix `null` signUp URL handling from #25014
Port 9be9f4f5e2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-28 16:52:16 +02:00
たいち ひ 8134d62112 [Glitch] Rewrite `<LoadGap />` as FC and TS
Port 6077f3e24c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-28 16:48:17 +02:00
Claire 973743ff50 Merge commit 'b6c687abc288b3ea7fe16bf38912462c2ca1b4e4' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  We removed it from glitch-soc.
  Keep it deleted.
2023-05-28 16:41:14 +02:00
Claire a7e6f3df20 Fix import order with ESLint
Port 7b5a274836 to glitch-soc
2023-05-28 16:38:10 +02:00
Claire fa16de4a4e Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' into glitch-soc/merge-upstream
Conflicts:
- `.eslintrc.js`:
  Upstream moved a configuration block in which we had added a glitch-only
  path.
  Moved the configuration block as upstream did.
- other files:
  Upstream reordered imports, and those files had different ones.
  Kept our version and reordered imports using the same rules.
2023-05-28 15:54:31 +02:00
Claire 214f04f04b [Glitch] Add support for custom sign-up URLs
Port 4d631fcfb7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-28 15:09:28 +02:00
Claire ffc7a57f8b [Glitch] Fix video player offering to expand in a lightbox when it's in an iframe
Port cbcf32777e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-28 15:06:29 +02:00
Claire 006bc485e4 Merge commit '3e747f08639a78ac86858f6a2d2fc08a05ff3365' into glitch-soc/merge-upstream 2023-05-28 15:01:53 +02:00
Claire 8793625bf3 [Glitch] Use JSX syntax for Fragments
Port abbc6dfcba to glitch-soc
2023-05-28 14:56:24 +02:00
Claire 31c4b3183b Merge commit 'abbc6dfcbaa105faee402694061c408d37320b75' into glitch-soc/merge-upstream 2023-05-28 14:32:26 +02:00
Claire fb2bf621eb [Glitch] Use the new JSX transform everywhere
Port 3b0c3e94e0 to glitch-soc
2023-05-28 14:18:43 +02:00
Claire 03a3ff1f02 Merge commit '3b0c3e94e0831edcf4298bf9940799a2e94c5583' into glitch-soc/merge-upstream 2023-05-28 13:55:30 +02:00
Claire 20e8b117e3 fixup! [Glitch] Upgrade to React 18 2023-05-26 18:44:18 +02:00
たいち ひ 114ad2d4d1 [Glitch] Rewrite `<TimelineHint />` as FC and TS
Port 9cfab99590 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-25 23:58:54 +02:00
たいち ひ 76e9386332 [Glitch] Rewrite `<Skeleton/>` as FC and TS
Port 0b87919abf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-25 23:55:36 +02:00
Claire 758a0ae1e9 [Glitch] Allow scripts in post embed previews
Port 18361ae0c5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-25 23:52:04 +02:00
Claire 569302e5ce Merge commit 'adaa7a61e9c87859251f4ac9be387d3d24c0a962' into glitch-soc/merge-upstream 2023-05-25 23:47:28 +02:00
Renaud Chaput 056dd39631 [Glitch] Upgrade to React 18
Port ab029328cf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-25 23:45:01 +02:00
Claire 3413fc7002 Merge commit 'ab029328cf94940dce7ed26d005af3d96a857a59' into glitch-soc/merge-upstream 2023-05-25 23:18:57 +02:00
Claire ee6f9d2c92 Merge commit 'cc5d2e22dd4b7afb9035cf999979e3cd36d97e46' into glitch-soc/merge-upstream 2023-05-25 22:59:30 +02:00
Claire 9e224add8a Merge commit '844d8e101e84cc1c27c99005b7059a975ac826ca' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
  Upstream merged our captcha code, but there are some
  conflicts due to glitch-soc's theming system.
- `app/views/admin/settings/registrations/show.html.haml`:
  Upstream merged our captcha code, but there are some
  conflicts due to glitch-soc's theming system.

Additional changes:
- `Gemfile`:
  Upstream added hcaptcha dependency in another place in the file.
- `config/settings.yml`:
  Upstream added the `captcha_enabled` setting in another place in the file.
2023-05-25 22:49:18 +02:00
Claire b55d56387b [Glitch] Add polling and automatic redirection to `/start` on email confirmation
Port 86961b5b7b to glitch-soc
2023-05-25 22:37:14 +02:00
Claire 560f605dc2 Merge commit '86961b5b7b459fd778a9b697bbdfbda03512babb' into glitch-soc/merge-upstream 2023-05-25 22:18:55 +02:00
Claire c3cca0eff4 [Glitch] Fix being unable to load past a full page of filtered posts in Home timeline
Port d2eef78d1c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-25 22:00:07 +02:00
Christian Schmidt 6cde4718c0 [Glitch] Fix UI crash in moderation interface when opening the media modal
Port 778fd4d29b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-25 21:57:19 +02:00
Eugen Rochko 12c177a34e [Glitch] Change "Sign in" to "Login"
Port d05ff56746 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-25 21:52:37 +02:00
Claire 0042d5a246 [Glitch] Fix videos being improperly positioned on safari
Port de95d0ca8f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-25 21:47:48 +02:00
Renaud Chaput e11d884c53 [Glitch] Add stricter ESLint rules for Typescript files
Port 6a3211876c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-25 21:43:19 +02:00
Nick Schonning dc9dcd0fa9 [Glitch] Enable ESLint react/no-deprecated
Port b0dd260a7a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-25 21:07:38 +02:00
Renaud Chaput afde99dc29 [Glitch] Disable RTK safety middlewares
Port c9dfc55b22 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-25 20:57:42 +02:00
fusagiko / takayamaki a3c2519ba0 [Glitch] Add type annotation for DisplayName component
Port a150bb4f2e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-25 20:57:07 +02:00
fusagiko / takayamaki b3e018ce58 [Glitch] Rename Image component to ServerHeroImage
Port cbca954632 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-25 20:44:09 +02:00
Claire 11368da545 Merge commit 'afb74b97b237a32c5e1db2a6a9968d587a3d5dd3' into glitch-soc/merge-upstream
Conflicts:
- `config/webpack/generateLocalePacks.js`:
  A dependency update changed how functions are imported.
  Also, some linting fixes not applicable to glitch-soc.
2023-05-25 20:43:25 +02:00
Claire 5a99be78e4 Fix margins around small avatars (reply indicators, autocompletion suggestion) (#2231)
Fix regression from #2156
2023-05-25 19:40:33 +02:00
Claire b13b71d1f5 Greatly simplify history management code (#2230)
Fixes #2220

This drops the ability to shift+click on “Back” to get back to a pinned
column, but that was inconsistent, broken, and undocumented.

This also brings us slightly closer to upstream.
2023-05-25 19:14:51 +02:00
Claire 56ac8eb6ea [Glitch] Update style of captcha confirmation page to match sign-up form (#2226) 2023-05-25 19:14:37 +02:00
fusagiko / takayamaki a19c1671af Rewrite actions/modal and reducers/modal with typescript (#24833) 2023-05-25 15:42:37 +02:00
たいち ひ ae0341c203 Fix export style of `<LoadGap />` based on `<Domain />` (#25128) 2023-05-25 13:03:37 +02:00
Renaud Chaput 169f141c4c Update inconsistent `defaultMessage` (#25114) 2023-05-24 12:38:50 +02:00
Eugen Rochko 97235baa4f Change share action from being in action bar to being in dropdown in web UI (#25105)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-05-24 11:04:43 +02:00
Renaud Chaput 9be9f4f5e2 Fix `null` signUp URL handling from #25014 (#25108) 2023-05-24 09:49:26 +02:00
たいち ひ 6077f3e24c Rewrite `<LoadGap />` as FC and TS (#25042) 2023-05-24 09:20:39 +02:00
Renaud Chaput 7b5a274836 Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
Claire 4d631fcfb7 Add support for custom sign-up URLs (#25014) 2023-05-23 15:17:09 +02:00
Claire cbcf32777e Fix video player offering to expand in a lightbox when it's in an iframe (#25067) 2023-05-23 14:28:21 +02:00
Renaud Chaput abbc6dfcba Use JSX syntax for Fragments (#25093) 2023-05-23 11:47:36 +02:00
Renaud Chaput 3b0c3e94e0 Use the new JSX transform (#25064) 2023-05-23 10:52:27 +02:00
たいち ひ 9cfab99590 Rewrite `<TimelineHint />` as FC and TS (#25091) 2023-05-23 10:04:10 +02:00
たいち ひ 0b87919abf Rewrite `<Skeleton/>` as FC and TS (#25055) 2023-05-23 08:58:08 +02:00
Claire 18361ae0c5 Allow scripts in post embed previews (#25071) 2023-05-22 21:18:21 +02:00
Renaud Chaput ab029328cf Upgrade to React 18 (#24916) 2023-05-22 15:48:01 +02:00
Nick Schonning 26cdb19dc6 Remove duplicate JPG type (#25054) 2023-05-22 12:46:20 +02:00
Nick Schonning c4f2b1e86a Fix minor typos in comments and spec names (#21831) 2023-05-19 17:13:29 +02:00
Claire 0206081e40 Fix AvatarComposite and DisplayName referencing undefined props (#2222) 2023-05-17 23:24:27 +02:00
Claire 844d8e101e Add hCaptcha support (#25019) 2023-05-16 23:27:35 +02:00
Claire 86961b5b7b Add polling and automatic redirection to `/start` on email confirmation (#25013) 2023-05-16 18:03:52 +02:00
Claire d2eef78d1c Fix being unable to load past a full page of filtered posts in Home timeline (#24930) 2023-05-16 15:36:25 +02:00
Claire 74ff0cd2d5 Change composer highlight border size to be more noticeable (#25010) 2023-05-16 14:59:44 +02:00
Steven Munn da2d3cc795 Fix spelling of "Lets" on the onboarding page after clicking the confirmation email (#24959)
Co-authored-by: Steven Munn <stevenjmunn@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-05-15 22:42:07 +02:00
Christian Schmidt 778fd4d29b Fix UI crash in moderation interface when opening the media modal (#24816) 2023-05-11 12:41:55 +02:00
Emelia Smith db07cfb150 Fix Onboarding Errors (#24883) 2023-05-11 07:55:10 +02:00
Eugen Rochko d05ff56746 Change "Sign in" to "Login" (#24942) 2023-05-10 20:17:55 +02:00
Claire de95d0ca8f Fix videos being improperly positioned on safari (#24943) 2023-05-10 17:22:34 +02:00
Renaud Chaput 6a3211876c Add stricter ESLint rules for Typescript files (#24926) 2023-05-10 12:59:29 +02:00
Nick Schonning b0dd260a7a Enable ESLint react/no-deprecated (#24471) 2023-05-10 09:05:32 +02:00
たいち ひ 2f09bbdfe0 Rewrite `logo.tsx` as FC (#24909) 2023-05-10 08:58:21 +02:00
Renaud Chaput c9dfc55b22 Disable RTK safety middlewares (#24936) 2023-05-10 08:38:02 +02:00
Claire abb99eca95 Remove our copy of image.d.ts as tsconfig already uses upstream's 2023-05-10 00:00:28 +02:00
Claire e63a08bafd Run prettier on Typescript files
Port 0886856bd2 to glitch-soc
2023-05-09 23:41:18 +02:00
Claire 710151baf4 Merge commit '0886856bd2adecedcad6fad9dcb86ed8069c46c0' into glitch-soc/merge-upstream 2023-05-09 23:37:38 +02:00
Renaud Chaput 487715a3e3 [Glitch] Type Redux store and middleware
Port d67de22458 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-09 23:28:40 +02:00
Renaud Chaput b21d2eaeb6 [Glitch] Remove unused iOS agent sniffing function
Port d57be2731c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-09 23:20:57 +02:00
Renaud Chaput e8415aa727 [Glitch] Rework polyfills loading
Port b640f89777 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-09 23:20:24 +02:00
fusagiko / takayamaki c5fb52eb23 [Glitch] Add more detailed type annotation for Account
Port a2e9b9d87d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-09 23:16:23 +02:00
Claire 7f078e41c0 Merge commit 'd67de22458e599447c0d5c85ecbd6fb5aef9b4f4' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  We deleted it.
  Kept it removed.
- `app/javascript/packs/public.jsx`:
  Upstream changed an import, we have slightly different ones.
  Ported upstream changes.
2023-05-09 23:12:48 +02:00
fusagiko / takayamaki a150bb4f2e Add type annotation for DisplayName component (#24752) 2023-05-09 23:08:54 +02:00
fusagiko / takayamaki cbca954632 Rename Image component to ServerHeroImage (#24894) 2023-05-09 23:08:28 +02:00
Claire 81b01c961b Disable broken onboarding code 2023-05-09 23:03:23 +02:00
Renaud Chaput d0545c950c [Glitch] Enforce stricter rules for Typescript files
Port 85b3823e66 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-09 22:56:26 +02:00
Renaud Chaput a7d51b92f3 [Glitch] Enforce React Rules of Hooks with eslint
Port b785500809 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-09 22:28:53 +02:00
Renaud Chaput 4e88d37759 [Glitch] Dont use CommonJS (`require`, `module.exports`) anywhere
Port 45146e3f3b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-09 22:28:53 +02:00
Claire 5c4a012ac5 Merge commit '85b3823e6638719511f705ecdd7e5ba09248cf2f' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did.
- `app/javascript/packs/public.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did.
2023-05-09 22:12:05 +02:00
たいち ひ 8a2bb3fb99 [Glitch] Add TypeScript support for `mastodon` alias and image imports
Port 5f709b1601 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-09 21:50:48 +02:00
Claire 43b38dc9e6 Copy hooks/useHovering.ts to glitch-soc 2023-05-09 21:30:10 +02:00
Claire a0047223a5 Fix IconButton prop types in glitch-soc 2023-05-09 21:11:23 +02:00
Renaud Chaput d8cae2752c [Glitch] Mark `wheel` events on scrollable list as passive
Port b8d44c55fd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-09 20:42:07 +02:00
fusagiko / takayamaki fe8412bcf4 [Glitch] Rewrite Domain component as function component
Port 4ab18dee50 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-09 20:33:58 +02:00
fusagiko / takayamaki 7630b904ee [Glitch] Use LayoutType from is_mobile in actions/app
Port 01caf92d80 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-09 20:32:30 +02:00
たいち ひ bf45760e0b [Glitch] Rewrite RadioButton component as FC
Port 13a16f3054 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-09 20:25:31 +02:00
たいち ひ 3c62d50502 [Glitch] Rewrite Image component as function component
Port c1ccb55a59 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-09 20:24:49 +02:00
たいち ひ 77edfc33ba [Glitch] Rewrite <NotSignedInIndicator /> as FC
Port 23a97effdb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-09 20:24:01 +02:00
Claire 63c706d26f Merge commit 'b8d44c55fd9264cdacf66c32541b4343e164bbfb' into glitch-soc/merge-upstream
Conflicts:
- `tsconfig.json`:
  Upstream changed the config to properly process imports.
  Glitch-soc had previously already done so.
  Changed the config to better match upstream.
2023-05-09 20:12:33 +02:00
Nick Schonning 0886856bd2 Use Prettier for ESLint formatting TypeScript (#23631) 2023-05-09 19:02:12 +02:00
Renaud Chaput d67de22458 Type Redux store and middleware (#24843) 2023-05-09 16:56:26 +02:00
Claire da803512c9 Fix javascript on moderation interface (#24933) 2023-05-09 16:42:02 +02:00
Renaud Chaput d57be2731c Remove unused iOS agent sniffing function (#24931) 2023-05-09 15:48:53 +02:00
Renaud Chaput b640f89777 Rework polyfills loading (#24907) 2023-05-09 14:55:35 +02:00
fusagiko / takayamaki a2e9b9d87d Add more detailed type annotation for Account (#24815) 2023-05-09 12:09:32 +02:00
Renaud Chaput 85b3823e66 Enforce stricter rules for Typescript files (#24910) 2023-05-09 03:11:56 +02:00
Renaud Chaput b785500809 Enforce React Rules of Hooks with eslint (#24911) 2023-05-09 03:09:11 +02:00
Renaud Chaput 45146e3f3b Dont use CommonJS (`require`, `module.exports`) anywhere (#24913) 2023-05-09 03:08:47 +02:00
Renaud Chaput b8d44c55fd Mark `wheel` events on scrollable list as passive (#24914) 2023-05-09 03:07:13 +02:00
Renaud Chaput 2354041cb7 [Glitch] Fixes build errors from some previous TS-related commits
Port e1985e14f6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 22:15:00 +02:00
fusagiko / takayamaki 31e4da41ee [Glitch] Rewrite actions/app.ts and reducers/missed_updates.ts with createAction
Port 9ed91c444e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 22:15:00 +02:00
Renaud Chaput 2c5141e5ed [Glitch] Remove MastodonMap TS type
Port 7bc13c1ca3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 22:15:00 +02:00
fusagiko / takayamaki ac97d77cb3 [Glitch] Add type annotation for some js files
Port 6fa4054a5d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 22:15:00 +02:00
Claire 902b2175df Copy Typescript type definitions to glitch-soc 2023-05-08 22:15:00 +02:00
Claire 9775d02a15 [Glitch] Fix incorrect import of redux store
Port d76495d080 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 22:15:00 +02:00
fusagiko / takayamaki 5af7007906 [Glitch] use configureStore of redux-toolkit instead of createStore of redux
Port 69bd3a86f3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 22:15:00 +02:00
Eugen Rochko c10a2036bc [Glitch] Add ALT badges to media that has alternative text in web UI
Port d6808a561e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 22:15:00 +02:00
Claire 62f5d29c25 [Glitch] Change media elements to use aspect-ratio rather than compute height themselves
Port 8c43856691 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 22:15:00 +02:00
Claire 319ff9bd71 [Glitch] Fix incorrect box shadow on avatar in thread view
Port 52ed627d9e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 21:09:49 +02:00
fusagiko / takayamaki e225a49255 [Glitch] Add type annotation for Blurhash component
Port fc4bb5ed66 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 21:09:49 +02:00
fusagiko / takayamaki cccf0bdace [Glitch] Add type annotation for IconButton component
Port bee49de3db to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 21:09:49 +02:00
Claire 348aed03cf Merge commit '0d919f27beb6e4e7a562a6eed8f354415b5c217e' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes, but we had removed it.
  Discarded upstream changes.
- `.rubocop_todo.yml`:
  Upstream regenerated the file, we had some glitch-soc-specific ignores.
- `app/models/account_statuses_filter.rb`:
  Minor upstream code style change where glitch-soc had slightly different code
  due to handling of local-only posts.
  Updated to match upstream's code style.
- `app/models/status.rb`:
  Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one.
  Moved the definitions as upstream did.
- `app/services/backup_service.rb`:
  Upstream rewrote a lot of the backup service, glitch-soc had changes because
  of exporting local-only posts.
  Took upstream changes and added back code to deal with local-only posts.
- `config/routes.rb`:
  Upstream split the file into different files, while glitch-soc had a few
  extra routes.
  Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb`
  and `config/routes/admin.rb`
- `db/schema.rb`:
  Upstream has new migrations, while glitch-soc had an extra migration.
  Updated the expected serial number to match upstream's.
- `lib/mastodon/version.rb`:
  Upstream added support to set version tags from environment variables, while
  glitch-soc has an extra `+glitch` tag.
  Changed the code to support upstream's feature but prepending a `+glitch`.
- `spec/lib/activitypub/activity/create_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests due to
  `directMessage` handling.
  Applied upstream's changes while keeping glitch-soc's extra tests.
- `spec/models/concerns/account_interactions_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests.
  Applied upstream's changes while keeping glitch-soc's extra tests.
2023-05-08 19:28:21 +02:00
Claire 2847b0423b Fix glitch-soc's thread line styling (#2214)
Thread lines were misaligned in glitch-soc because we have less padding and
larger avatar sizes.
2023-05-08 18:21:36 +02:00
fusagiko / takayamaki dd098625f0 [Glitch] Add type annotation for RelativeTimestamp component
Port 90e4ab9f8f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 16:02:59 +02:00
fusagiko / takayamaki c17c65aa57 [Glitch] Rewrite Icon and IconWithBadge with typescript
Port 27a750cc04 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 15:59:27 +02:00
Eugen Rochko 5bfff5807a [Glitch] Fix icons having an image role
Port c7924acf16 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 15:57:35 +02:00
Claire acc7cdc664 [Glitch] Fix audio player width in thread view
Port 9cf043f63a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 15:50:05 +02:00
Nick Schonning 55561098c4 [Glitch] Add eslint-plugin-jsdoc
Port 0224c3c0d9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 15:48:08 +02:00
Christian Schmidt a9089a2458 [Glitch] Fix media description not being cleared
Port 6ccea199ca to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 15:41:17 +02:00
Claire 2aaf3528ca Merge commit 'd548faf69321260ab4c2a16759ca77773189126a' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
  Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
  Code style changes but we have a different version.
  Kept our version.
- `streaming/index.js`:
  Upstream fixed a typo close to glitch-soc-only code.
  Applied upstream's changes.
2023-05-08 15:28:36 +02:00
Claire c90f09d36f Fix more JS linting issues (#2212)
* Fix uses of intl.formatMessages without default messages

* Ignore lint issue for ColumnLink button
2023-05-08 15:16:55 +02:00
fusagiko / takayamaki 4ab18dee50 Rewrite Domain component as function component (#24896) 2023-05-08 15:12:12 +02:00
fusagiko / takayamaki 01caf92d80 Use LayoutType from is_mobile in actions/app (#24863) 2023-05-08 15:10:21 +02:00
Claire db240323f6 Fix some more JS linting issues (#2211)
* Minor refactor and linting fixup in `flavours/glitch/actions/accounts.js`

This is some added boilerplate but it's much more consistent with the remaining
of the code, and avoids the linting issue.

* Fix missing /privacy-policy link in DM warning because of wrongly-named import

* Fix unnecessary import

* Fix regexp in flavours/glitch/utils/hashtag.js
2023-05-08 14:02:41 +02:00
たいち ひ 5f709b1601 Add TypeScript support for `mastodon` alias and image imports (#24895) 2023-05-08 11:28:36 +02:00
たいち ひ 13a16f3054 Rewrite RadioButton component as FC (#24897) 2023-05-08 11:12:53 +02:00
たいち ひ c1ccb55a59 Rewrite Image component as function component (#24893) 2023-05-08 11:12:44 +02:00
たいち ひ 23a97effdb Rewrite <NotSignedInIndicator /> as FC (#24903) 2023-05-08 11:12:13 +02:00
たいち ひ daecca565e Rewrite <Check /> as FC (#24901) 2023-05-08 08:26:02 +02:00
Claire 12e8bcac9d Fix some more Javascript linting issues and discrepancies with upstream (#2209)
* Fix typo in flavours/glitch/features/video/index.js

* Fix various linting issues and discrepancies with upstream
2023-05-07 21:43:25 +02:00
Claire 43c40b5df8 Fix thread lines not being properly updated when new posts are received (#2210) 2023-05-07 20:06:10 +02:00
Plastikmensch ef5df7fc66 Reset language to default when cancelling a reply (#2114)
When cancelling a reply, the language was still set to the language of the replied to toot.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-05-07 18:45:10 +02:00
Claire e390c26429 Fix some of the Javascript linting issues, as well as bugs and unneeded divergences with upstream (#2208)
* Run eslint --fix

* Fix linting issues in video player and reduce divergences with upstream

This includes a behavior change of not auto-looping videos anymore. I don't
remember loops being ever intended, and they have been removed from upstream
a while ago, but we somehow missed the change.

* Fix lint issues in `app/javascript/flavours/glitch/selectors/index.js`

Those were basically caused by dead code that isn't present upstream, so
that brings us closer to upstream as well.

* Fix linting issue and bug in streaming/index.js

* Fix linting issues in config/webpack/shared.js

* Fix unused import in flavours/glitch/features/ui/index.js

* Fix linting issues and reduce divergences from upstream in flavours/glitch/features/ui/components/video_modal.jsx

* Fix linting issues in flavours/glitch/reducers

* Fix linting issues in glitch-soc onboarding modal

* Fix linting issues in flavours/glitch/features/ui/components/navigation_panel.jsx

* Remove dead code for unused local setting navbar_under

* Fix various linting issues

* Fix linting issues in flavours/glitch/components/scrollable_list.jsx and reduce divergences with upstream
2023-05-07 18:22:25 +02:00
Claire b80dc7d2ed Fix SCSS linting issues (#2207)
* Disable font-family-no-missing-generic-family-keyword for font-awesome accessibility icons

* Run stylelint --fix

* Avoid `@extend` directives with doodle modal CSS

* Drop use of `@extend` for notification cleanup buttons SCSS

* Run prettier on SCSS
2023-05-07 15:04:59 +02:00
Claire 481aed8061 New Crowdin updates (#2202)
* New translations en.json (Russian)
[ci skip]

* New translations en.json (Russian)
[ci skip]
2023-05-07 13:37:47 +02:00
fusagiko / takayamaki 2c894915dc Rewrite VerifiedBadge component as function component (#24892) 2023-05-07 09:10:58 +02:00
Claire f18f692f65 Fix compose textarea scroll behavior (#24872) 2023-05-05 18:58:58 +02:00
S.H 2a651be35a Fix column back button error (#24867) 2023-05-05 15:13:28 +02:00
Nick Schonning c366c93cfd Fail ESLint for Warnings in CI (#24836) 2023-05-04 09:48:50 +02:00
Florin 1421a8efbd Fix Back button going outside the app (#24835) 2023-05-04 08:14:04 +02:00
Renaud Chaput e1985e14f6 Fixes build errors from some previous TS-related commits (#24811) 2023-05-03 16:28:14 +02:00
fusagiko / takayamaki 9ed91c444e Rewrite actions/app.ts and reducers/missed_updates.ts with createAction (#24801) 2023-05-03 15:28:39 +02:00
Renaud Chaput 7bc13c1ca3 Remove MastodonMap TS type (#24807) 2023-05-03 13:32:11 +02:00
fusagiko / takayamaki 6fa4054a5d Add type annotation for some js files (#24787) 2023-05-03 11:43:29 +02:00
Claire d76495d080 Fix incorrect import of redux store (#24805) 2023-05-03 10:29:45 +02:00
Claire 52ed627d9e Fix incorrect box shadow on avatar in thread view (#24800) 2023-05-03 09:11:20 +02:00
fusagiko / takayamaki 69bd3a86f3 use configureStore of redux-toolkit instead of createStore of redux (#24790) 2023-05-02 20:39:06 +02:00
Eugen Rochko d6808a561e Add ALT badges to media that has alternative text in web UI (#24782) 2023-05-02 14:47:04 +02:00
Claire 8c43856691 Change media elements to use aspect-ratio rather than compute height themselves (#24686) 2023-05-02 13:58:48 +02:00
fusagiko / takayamaki fc4bb5ed66 Add type annotation for Blurhash component (#24750) 2023-05-02 12:54:00 +02:00
fusagiko / takayamaki bee49de3db Add type annotation for IconButton component (#24753) 2023-05-02 12:53:32 +02:00
Nick Schonning 7a13eb370f Bump stylelint-config-standard-scss from 7.0.1 to 9.0.0 (#24755)
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-05-01 18:23:57 +09:00
fusagiko / takayamaki 90e4ab9f8f Add type annotation for RelativeTimestamp component (#24749) 2023-05-01 00:51:31 +02:00
fusagiko / takayamaki 27a750cc04 Rewrite Icon and IconWithBadge with typescript (#24747) 2023-05-01 00:51:00 +02:00
Eugen Rochko b9f44a797a New Crowdin updates (#24678)
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-30 17:02:11 +09:00
Claire 9dfb594a45 Fix pop-in player placeholder layout in thread view (#24715) 2023-04-30 06:42:43 +02:00
Claire 9cf043f63a Fix audio player width in thread view (#24713) 2023-04-30 06:42:22 +02:00
Nick Schonning 0224c3c0d9 Add eslint-plugin-jsdoc (#24719) 2023-04-30 02:29:54 +02:00
Christian Schmidt 6ccea199ca Fix media description not being cleared (#24720) 2023-04-30 02:29:24 +02:00
Claire eb3911d9bf Restore translations from not-yet-ported onboarding changes as glitch-soc translations 2023-04-29 19:38:08 +02:00
Eugen Rochko ffb5a3d4f3 [Glitch] Change logo version in header based on screen size in web UI
Port 4e6e4bcc4d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-29 18:54:13 +02:00
Nick Schonning c4e35a3f68 [Glitch] Enable formatjs/prefer-pound-in-plural
Port 86d0a0b7d8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-29 18:38:23 +02:00
Claire a1a60257c5 Disable full-width media in thread view 2023-04-29 12:43:01 +02:00
Claire a6a1587450 [Glitch] Fix thread lines in right-to-left locales (#24714)
Port 4e7a3a2faf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-29 12:21:44 +02:00
Claire c82f3a67c1 [Glitch] Fix sass warning about deprecated slash as division (#24653)
Port 3141130720 to glitch-soc

Co-authored-by: Nick Schonning <nschonni@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-29 12:17:06 +02:00
Eugen Rochko a2a800c212 [Glitch] Add lines to threads in web UI
Port 4141f9228c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-29 12:08:13 +02:00
Eugen Rochko bf04ff4601 [Glitch] Change label from "For you" to "People" on explore screen in web UI
Port a6c7401225 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-29 11:34:44 +02:00
Chike Nwaenie 1b1a7e5a51 [Glitch] Change styling of the recommended accounts to allow bio to be more visible
Port 84adcaa474 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-29 11:28:24 +02:00
Christian Schmidt ab2df6fb69 [Glitch] Use CSS to trim long card descriptions
Port 4613dfe97b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-29 11:26:58 +02:00
Claire 5c4f034e9b [Glitch] Fix infinite loop in emoji replacement code
Port a55f461b4b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-29 11:14:43 +02:00
Claire 53e8b2dc7e [Glitch] Fix characters being emojified even when using Variation Selector 15 (text)
Port 2473078db7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-29 11:12:35 +02:00
fusagiko / takayamaki e45bb3f893 [Glitch] Allow `==` when null checking
Port f14395c2cf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-29 11:09:46 +02:00
Claire 498de92bc8 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, removed in glitch-soc to disable noise.
  Kept removed.
- `CODE_OF_CONDUCT.md`:
  Upstream updated to a new version of the covenant, but I have not read it
  yet, so kept unchanged.
- `Gemfile.lock`:
  Not a real conflict, one upstream dependency updated textually too close to
  the glitch-soc only `hcaptcha` dependency.
  Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/application_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/helpers/application_helper.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream added a highlight animation for onboarding, while we changed the
  max character limit.
  Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `stylelint.config.js`:
  Upstream added ignore paths, glitch-soc had extra ignore paths.
  Added the same paths as upstream.
2023-04-29 10:44:56 +02:00
Claire 4e7a3a2faf Fix thread lines in right-to-left locales (#24714) 2023-04-28 13:12:35 +02:00
Claire febcc47cb3 Fix wrong classes `audio` and `video` instead of `audio-player` and `video-player` in CSS (#24711) 2023-04-28 11:15:43 +02:00
Eugen Rochko ff65e8e974 Add default post text to onboarding flow in web UI (#24705) 2023-04-28 10:05:34 +02:00
Eugen Rochko 4e6e4bcc4d Change logo version in header based on screen size in web UI (#24707) 2023-04-28 10:00:33 +02:00
Eugen Rochko a6c7401225 Change label from "For you" to "People" on explore screen in web UI (#24706) 2023-04-28 08:54:20 +02:00
Claire 7aed94ab13 Fix refering to unused `preview-card` CSS class instead of `status-card` (#24696) 2023-04-28 07:50:31 +02:00
Claire 4fb3d20faf Fix preview cards layout in thread view (#24677) 2023-04-27 01:45:19 +02:00
Eugen Rochko 231c132159 New Crowdin updates (#24617)
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-27 04:55:06 +09:00
Plastikmensch c33ecc00fa [Glitch] [Proposal] Make able to write React in Typescript (#2190)
Port 4866812b28 to glitch-soc

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-26 21:30:41 +02:00
Claire 3141130720 Fix sass warning about deprecated slash as division (#24653)
Co-authored-by: Nick Schonning <nschonni@gmail.com>
2023-04-25 22:15:00 +02:00
Plastikmensch c6305b9817 Fix small mistakes in RTL layout (#2182)
Borders in blockquotes in reply-indicator weren't colored properly.

avatar margin when viewing edited toots dropdown was applied to wrong side.

Conversations had padding applied to the wrong side.

Padding for notifcation cleaner checkboxes was applied to wrong side.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-25 20:33:27 +02:00
Plastikmensch 10259df1be Change `drawer--header` to `drawer__header` (#2189)
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-25 20:29:04 +02:00
Eugen Rochko d94f500d9c Add more tips to onboarding flow in web UI (#24646) 2023-04-25 11:12:37 +02:00
Eugen Rochko 49493f8b50 Change hashtags and mentions in bios to open in-app in web UI (#24643) 2023-04-25 06:33:21 +02:00
Eugen Rochko 1af9d25c8a Fix cutting off first letter of hashtag links sometimes in web UI (#24623) 2023-04-24 09:53:54 +02:00
Nick Schonning 86d0a0b7d8 Enable formatjs/prefer-pound-in-plural (#24622) 2023-04-24 08:07:19 +02:00
Eugen Rochko 4141f9228c Add lines to threads in web UI (#24549) 2023-04-24 08:07:03 +02:00
Nick Schonning 92e237574f Remove empty Kushubian (csb) local files (#24151) 2023-04-23 22:43:12 +02:00
Chike Nwaenie 84adcaa474 Change styling of the recommended accounts to allow bio to be more visible (#24480) 2023-04-23 22:33:08 +02:00
Christian Schmidt 4613dfe97b Use CSS to trim long card descriptions (#24265) 2023-04-23 22:32:47 +02:00
Eugen Rochko 30666618ea Add new onboarding flow to web UI (#24619) 2023-04-23 22:24:53 +02:00
Claire f353e2b0b5 Fix JS crashing if initial-state is not set (#2193)
Fixes issues with the JS for at least sign-up pages not working
2023-04-22 19:13:20 +02:00
Eugen Rochko 4a0aa54a87 New Crowdin updates (#24517)
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-22 19:37:41 +09:00
fusagiko / takayamaki 0015bd91a6 [Glitch] Rewrite AnimatedNumber component with React hooks
Port b72a9eb02e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-22 11:28:23 +02:00
fusagiko / takayamaki eadf9807fb [Glitch] Rewrite GIFV component with React hooks
Port e8450b1dc2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-22 11:22:49 +02:00
Eugen Rochko 0bc7beb1b1 [Glitch] Add client-side validation for taken username in sign-up form
Port 39bb8504b5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-22 10:47:44 +02:00
Claire 3919549c96 [Glitch] Fix crash when trying to open the filter modal
Port 8e36b04fd2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-22 10:20:50 +02:00