Commit Graph

12632 Commits

Author SHA1 Message Date
Claire 52c023a305 Convert `Permalink` to Typescript 2024-01-14 19:22:39 +01:00
Claire 16499bc097 Rewrite `Permalink` as functional component 2024-01-14 19:22:39 +01:00
Claire 0213ae6b37 Extract glitch-soc-only i18n string 2024-01-14 16:32:08 +01:00
Eugen Rochko 6772bf611e [Glitch] Fix wrong color on active icons with counters in web UI
Port 728eb6a153 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 16:32:08 +01:00
Eugen Rochko cc363629be [Glitch] Fix focus and hover styles in web UI
Port cfd50f30bb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 16:32:08 +01:00
Trevor Wolf 7565a328d0 [Glitch] change column link to add a better keyboard focus indicator
Port 6308dca76a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 16:32:08 +01:00
Trevor Wolf c1e28c8913 [Glitch] change focus ui for keyboard only input
Port 59478a1b46 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 16:32:08 +01:00
Eugen Rochko a7bad8f45c [Glitch] Fix profile setup showing default avatar in web UI
Port 01f0a6ca4f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 16:32:08 +01:00
Eugen Rochko b534532eaf [Glitch] Change to single opt-in during profile setup in onboarding in web UI
Port 0e9801443f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 16:32:08 +01:00
Eugen Rochko bacb9134cc [Glitch] Add profile setup to onboarding in web UI
Port d67bd44ca1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 16:32:08 +01:00
Renaud Chaput 2653651bfa [Glitch] Simplify column headers
Port 13d310e64d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 14:31:49 +01:00
Renaud Chaput ca17c2d35a [Glitch] Use a context to propagate column-related Props, and remove `forceUpdate` usage
Port 537442853f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 14:31:49 +01:00
Claire e2c7c370dc Fix size of glitch-soc status info icons 2024-01-14 00:09:28 +01:00
Claire e2ba5f6e35 Fix glitch-soc high color privacy icons 2024-01-14 00:04:09 +01:00
Claire e227e959f7 Fix glitch-soc textarea icons 2024-01-13 23:53:23 +01:00
Claire 6333900006 Fix glitch-soc CW media icons 2024-01-13 23:48:37 +01:00
Claire 46128f25b6 Fix glitch-soc status media icons 2024-01-13 23:35:53 +01:00
Santiago Kozak 731f01adb1 [Glitch] Fix reply icon display in picture-in-picture footer
Port 1cba91d6d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Renaud Chaput dd56900fac [Glitch] Fixes dropdown target without a `buttonRef` (edit history)
Port 7b1d390734 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Eugen Rochko a8c59c2506 [Glitch] Add icons for private and disabled boost in web UI
Port 7e3c10dec6 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
zunda b2a6386b7d [Glitch] Adjust transform origin for favorite star
Port e4e752c26e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Eugen Rochko 6230d50f3f [Glitch] Fix various icon styles in web UI
Port fa7e64df1d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Renaud Chaput b67d977e20 [Glitch] Add missing ban icons
Port a4e6fe36cb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Renaud Chaput 9b32a37b6f [Glitch] Fix missing icon props
Port f08ca3f042 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Eugen Rochko d54414866c [Glitch] Change icons in web UI
Port 134de736dc to glitch-soc

Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Claire 5f8618443c
Merge pull request #2566 from ClearlyClaire/glitch-soc/ports/badge-design
Port upstream's role badge design
2024-01-13 14:25:55 +01:00
Eugen Rochko eae3275fff [Glitch] Change design of role badges in web UI
Port 2cbdff97ce to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 13:09:04 +01:00
Claire a40ce78f11 [Glitch] Add role badges to the WebUI
Port 1e4ccc655a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 12:50:27 +01:00
Claire a25e03dbc3 Revert "Add role badges to WebUI (#2096)"
This reverts commit d9a078e6d3.
2024-01-13 12:43:25 +01:00
Renaud Chaput d6609635cb [Glitch] Add a version comment to the emoji preval-ed file so it is regenerated
Port 383be173af to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 12:39:09 +01:00
Essem ca31b4de3a [Glitch] Add new emojis from `jdecked/twemoji` 15.0
Port b6e353537b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 12:39:09 +01:00
Claire a3b6a85521 Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream
Conflicts:
- `.prettierignore`:
  Conflict due to glitch-soc-only files.
  Kept those at the end of the file.
2024-01-13 12:11:29 +01:00
Claire 6bbcd9348e
Switch from 48px weight 600 material symbol icons to 24px weight 400 icons (#28064) 2024-01-12 20:16:48 +00:00
Claire 1070804a1a
Fix `RedownloadMediaWorker` not being called on transient S3 failure (#28714) 2024-01-12 17:00:17 +00:00
MitarashiDango 2c05b8a60d
Fix Undo Announce activity is not sent, when not followed by the reblogged post author (#18482)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-12 15:58:28 +00:00
Matt Jankowski a90c134850
Move followable by logic to suggestion class (#28710) 2024-01-12 13:09:33 +00:00
Renaud Chaput 608f66f978
Change icon SVG imports to use a default import (#28709) 2024-01-12 10:31:24 +00:00
Renaud Chaput c6684aa1e3
Use the assets pipeline to load `inert.css` (#28701) 2024-01-12 09:32:45 +00:00
Matt Jankowski a90696011e
Add coverage/bugfix for invalid appeal submission (#28703) 2024-01-12 09:21:00 +00:00
Matt Jankowski 7801db7ba4
Spec coverage for custom css endpoint (#28706) 2024-01-12 09:19:25 +00:00
github-actions[bot] b86083f0dc
New Crowdin Translations (automated) (#28708)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-12 09:17:10 +00:00
Matt Jankowski 575ab085be
Disable `Rails/ApplicationController` for `HealthController` (#28705) 2024-01-12 09:08:17 +00:00
Renaud Chaput 383be173af
Add a version comment to the emoji preval-ed file so it is regenerated (#28700) 2024-01-12 03:39:11 +00:00
Claire 15bc13c65b Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream 2024-01-11 20:15:19 +01:00
Essem b6e353537b
Add new emojis from `jdecked/twemoji` 15.0 (#28404) 2024-01-11 16:15:08 +00:00
Matt Jankowski b68f185573
Reduce `LineLength` for `react_component` helper in views/admin (#28694) 2024-01-11 13:14:24 +00:00
Claire 23d8bd8ce1 Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream 2024-01-11 13:24:20 +01:00
Claire 5dcb8d92c3 Fix lint issue in glitch-soc-only setting form 2024-01-11 13:22:39 +01:00
Claire 63acdebc5d Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict because of a code style fix, while some changed lines are
  absent from glitch-soc.
  Ignored the deleted lines.
2024-01-11 13:17:13 +01:00
Claire 630b245bb4 Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream
Conflicts:
- `app/lib/settings/scoped_settings.rb`:
  Removed upstream, while glitch-soc had a change related to its theming system.
  Removed as well, as it's unused.
2024-01-11 12:59:27 +01:00
github-actions[bot] e5b97eadd5
New Crowdin Translations (automated) (#2502)
* 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>
2024-01-11 12:56:56 +01:00
Matt Jankowski 87097a227c
Clean up `settings/featured_tags/index` view (#28688) 2024-01-11 10:45:26 +00:00
Matt Jankowski 55802242ce
Refactor login activity partial (remove inline ruby) (#28687) 2024-01-11 10:36:27 +00:00
github-actions[bot] 204bbf49d2
New Crowdin Translations (automated) (#28692)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-11 10:08:49 +00:00
Matt Jankowski 6daa69327b
Fix `LineLength` haml-lint in `t` usage (#28686) 2024-01-11 09:32:32 +00:00
Claire 47d213e701 Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream 2024-01-10 18:41:04 +01:00
Renaud Chaput 09376a8207 [Glitch] Upgrade Redux packages
Port a0e237a96f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-10 18:34:23 +01:00
Claire 51d2d98174 Merge commit 'a0e237a96fca2774d3c9ed43063a45e395bb7f40' into glitch-soc/merge-upstream 2024-01-10 18:26:47 +01:00
Claire 7cd88ae2f4 [Glitch] Fix scrolling to detailed status not always working
Port d0fd14f851 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-10 18:02:37 +01:00
Claire 0b2c7cdb02 Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream
Conflicts:
- `app/lib/content_security_policy.rb`:
  Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
  environment variable.
  Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.
2024-01-10 17:51:12 +01:00
Claire d7e13e2483
Fix potential redirection loop of streaming endpoint (#28665) 2024-01-10 15:05:46 +00:00
Matt Jankowski 543d7890fd
Use normalizes to prepare `User` values (#28650)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-10 13:36:06 +00:00
Matt Jankowski a71e918e95
Fix `LineLength` haml-lint in `media/player` view (#28667) 2024-01-10 09:35:01 +00:00
Matt Jankowski eed4eef39a
Fix `LineLength` haml-lint in `app/views/auth` area (#28664) 2024-01-09 16:03:16 +00:00
Matt Jankowski 09ab073f0c
Fix `LineLength` haml-lint in `app/views/settings` area (#28663) 2024-01-09 15:28:56 +00:00
Claire 10203bd57a
Clean up `Setting` model and remove dead code (#28661) 2024-01-09 14:01:53 +00:00
Jean Boussier 1781849884
Inline what remains of the rails-settings-cached gem (#28618)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-09 11:50:21 +00:00
gunchleoc 173953c23e
Fix ISO code for Canadian French (#26015)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-09 10:56:13 +00:00
Matt Jankowski 68f06f1fd4
Fix haml-lint `LineLength` cop for `settings/preferences/notifications/show` (#28655) 2024-01-09 09:31:32 +00:00
github-actions[bot] 8e7d5fe2ac
New Crowdin Translations (automated) (#28658)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-09 09:30:33 +00:00
Matt Jankowski cd4b4d4734
Replace unused `by_recent_sign_in` scope (#28616) 2024-01-08 15:31:13 +00:00
Matt Jankowski e677eb164c
Remove unused `Announcement#time_range?` (#28648) 2024-01-08 15:26:30 +00:00
Matt Jankowski 3e43cd095c
Remove unused scope `Announcement.without_muted` (#28645) 2024-01-08 15:26:14 +00:00
Matt Jankowski 9322396e58
Use normalizes to prepare `Account#username` value (#28646) 2024-01-08 13:48:31 +00:00
Matt Jankowski cd58e37b25
Remove unused `DomainBlock#affected_accounts_count` method (#28642) 2024-01-08 13:38:52 +00:00
Matt Jankowski 3e7a9266ea
Remove unused `EmojiFormatter#count_tag_nesting` method (#28643) 2024-01-08 13:36:47 +00:00
Matt Jankowski 4ccba94489
Remove unused `*_silenced_accounts` scopes on Status (#28644) 2024-01-08 13:35:53 +00:00
Matt Jankowski c52a593a30
Remove unused scope `User.emailable` (#28647) 2024-01-08 13:33:45 +00:00
Matt Jankowski e827c4692c
Use Arel `matches` method in CustomEmoji search (#28615) 2024-01-08 13:26:12 +00:00
github-actions[bot] cc67943df2
New Crowdin Translations (automated) (#28627)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-08 12:46:25 +00:00
Matt Jankowski 1bc5a52139
Extract SQL heredoc method for Announcement scopes (#28613) 2024-01-08 11:22:16 +00:00
Matt Jankowski aa6d07dbd9
Use normalizes to prepare CustomEmoji `domain` value (#28624) 2024-01-08 11:20:59 +00:00
Matt Jankowski 202951e6d9
Use Arel `in_order_of` method to generate CASE for `DomainBlock.by_severity` (#28617) 2024-01-08 11:15:36 +00:00
Matt Jankowski 57f49c8191
Use Arel `nulls_first` method in ordering CustomEmojiFilter scope (#28614) 2024-01-08 11:09:50 +00:00
Renaud Chaput a0e237a96f
Upgrade Redux packages (#28585) 2024-01-08 10:57:40 +00:00
Jean Boussier 5a6d533c53
Enable Rails 7.1 Marshalling format (#28609) 2024-01-05 21:57:47 +00:00
Matt Jankowski 12bed81187
Add validation specs to `CustomFilter` model (#28600) 2024-01-05 15:13:59 +00:00
github-actions[bot] 43d800ada6
New Crowdin Translations (automated) (#28604)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-05 11:29:19 +00:00
Claire 6ad0fb5a77
Fix NULL MX handling and tighten DNS resolving specs (#28607) 2024-01-05 11:07:57 +00:00
Claire 5f4643b895
Add `PAPERCLIP_ROOT_URL` to Content-Security-Policy when used (#28561) 2024-01-05 10:45:36 +00:00
Claire d0fd14f851
Fix scrolling to detailed status not always working (#28577) 2024-01-04 14:17:38 +00:00
Claire 419c659bc4
Add fallback redirection when getting a webfinger query `WEB_DOMAIN@WEB_DOMAIN` (#28592) 2024-01-04 14:14:46 +00:00
github-actions[bot] bdf4750633
New Crowdin Translations (automated) (#28590)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-04 09:24:13 +00:00
Claire dfdadb92e8
Add ability to require approval when users sign up using specific email domains (#28468) 2024-01-04 09:07:05 +00:00
Claire 0b5783f3f1 Merge commit 'f92d8c654df654538096efff05e9b1a989d01490' into glitch-soc/merge-upstream 2024-01-03 20:52:19 +01:00
Michael Stanclift 195b89d336
Fix .opus file uploads being misidentified by Paperclip (#28580) 2024-01-03 19:02:53 +00:00
Matt Jankowski e12d8893f4
Fix intermittent failure from unspecified order in `export_domain_blocks` controller spec (#28562) 2024-01-03 13:06:15 +00:00
Claire 9d9008666b Merge commit '092bb8a27af9ee87ff9ebabaf354477470ea3a94' into glitch-soc/merge-upstream 2024-01-03 12:38:49 +01:00
Claire 092bb8a27a
Fix Mastodon not correctly processing HTTP Signatures with query strings (#28476) 2024-01-03 11:29:26 +00:00
github-actions[bot] 7cce2a41f2
New Crowdin Translations (automated) (#28573)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-03 09:19:46 +00:00
Claire 48c9192b47 [Glitch] Fix loading local accounts with extraneous domain part in WebUI
Port 65ea097f1d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-02 18:16:57 +01:00
Claire f685c953e5 Merge commit '3944b12b5eec8c6ae4666ec922411b32b3442dd6' into glitch-soc/merge-upstream 2024-01-02 18:12:28 +01:00
Claire 65ea097f1d
Fix loading local accounts with extraneous domain part in WebUI (#28559) 2024-01-02 15:02:25 +00:00
Michael Stanclift 0cd497ba7d [Glitch] Fix OCR when using S3/CDN for assets
Port fdec8d7ffb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-02 13:37:04 +01:00
Claire b3542ac57b Merge commit '1184887b012e863fbf44f65ef5c65e0049123c27' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept our README.
2024-01-02 13:35:11 +01:00
Claire 1184887b01
Fix streaming API redirection ignoring the port of `streaming_api_base_url` (#28558) 2024-01-02 12:27:51 +00:00
github-actions[bot] 0374e11091
New Crowdin Translations (automated) (#28529)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-02 09:11:53 +00:00
Michael Stanclift fdec8d7ffb
Fix OCR when using S3/CDN for assets (#28551) 2024-01-02 09:09:54 +00:00
Claire eb342a6082 Fix media attachments not being hidden in report modal in glitch flavor 2023-12-29 17:47:30 +01:00
Cal Moody df43bb124c [Glitch] Fix destructive actions in dropdowns not using error color in light theme
Port 3599622b5b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-29 17:43:53 +01:00
Claire 35b6583371 Merge commit '6374358357ee81b5f137f471f028a56974109155' into glitch-soc/merge-upstream 2023-12-29 17:40:57 +01:00
Claire 6374358357
Change media to be hidden/blurred by default in report modal (#28522) 2023-12-29 16:34:13 +00:00
Claire fcfdeadc04
Fix random `NoMethodError` errors on cached `CustomFilter` objects (#28521) 2023-12-29 16:23:07 +00:00
Cal Moody 3599622b5b
Fix destructive actions in dropdowns not using error color in light theme (#28484) 2023-12-29 11:32:40 +00:00
Matt Jankowski ba5f659bb3
Use shorter attribute query methods in `Announcement` (#28474) 2023-12-29 10:55:50 +00:00
github-actions[bot] 7df9c4f6f3
New Crowdin Translations (automated) (#28481)
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-29 10:39:10 +00:00
Matt Jankowski 128c5b7db3
Fix `Performance/StringIdentifierArgument` cop (#28508) 2023-12-29 10:23:30 +00:00
Santiago Kozak 1cba91d6d1
Fix reply icon display in picture-in-picture footer (#28519) 2023-12-29 09:48:27 +00:00
Claire c5b0e6d5a0 Merge branch 'main' into glitch-soc/merge-upstream 2023-12-28 16:57:10 +01:00
Claire 19e14654cc
Reduce CSP configuration changes with upstream (#2536) 2023-12-27 09:54:05 +01:00
Claire ea6c187fca Fix media attachment order of remote posts (#28469) 2023-12-22 18:45:36 +01:00
Claire 72ff0d30d8
Fix submitting post from content warning field not working properly (#2538) 2023-12-22 17:23:15 +01:00
Claire 2bf84b93d4
Fix media attachment order of remote posts (#28469) 2023-12-22 15:10:39 +00:00
github-actions[bot] e70a65761a
New Crowdin Translations (automated) (#28467)
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-22 07:58:20 +00:00
Renaud Chaput 1c041356a1
Fix error on viewing a profile when unlogged (#28465) 2023-12-21 20:19:18 +00:00
Claire 92aa6e2ec9 Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream 2023-12-21 19:42:13 +01:00
Claire 30ee7339d3 Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream changed code style change, including on a line modified by glitch-soc.
  Kept glitch-soc's line but with the code style change applied.
2023-12-21 19:31:12 +01:00
Claire f5b7307890 Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream
Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's version of the conflicting lines.
2023-12-21 19:24:10 +01:00
Claire 7a0be26367 [Glitch] Fix empty column explainer getting cropped under certain conditions
Port 3f1ec16377 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-21 19:08:43 +01:00
Claire a60b9acf3c Merge commit 'b2f915b31ae884e3893e93a99da4e2b8d7e9ef7b' into glitch-soc/merge-upstream 2023-12-21 19:04:20 +01:00
Claire 6e56f95285 Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream modified its README, we have a completely different one.
  Kept our README file.
2023-12-21 18:17:17 +01:00
Eugen Rochko 5976d3702f
Change "Follow" to "Follow back" and "Mutual" when appropriate in web UI (#28452) 2023-12-21 09:44:09 +00:00
github-actions[bot] 9e5ddc1745
New Crowdin Translations (automated) (#28451)
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-21 09:09:00 +00:00
Eugen Rochko 01f0a6ca4f
Fix profile setup showing default avatar in web UI (#28453) 2023-12-21 08:32:25 +00:00
Claire 9ac13bbc9c Fix glitch-only HAML linting issue 2023-12-20 22:27:29 +01:00
Matt Jankowski 01e77a0f34 [Glitch] Enable the eslint `react/no-unknown-property` rule
Port ee83d5c760 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-20 22:24:40 +01:00
Claire 077e0c6812 Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`:
  Conflict caused by the `json` gem thing once again.
  Updated as upstream did, but keeping the most recent `json` version.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored a bunch of specs, including one place that differs
  because of glitch-soc's theming system.
  Refactored as upstream did, adapting it for glitch-soc's theming system.
2023-12-20 22:16:50 +01:00
Claire 75580360cd Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream
Conflicts:
- `.rubocop_todo.yml`:
  Upstream fixed a bunch lint issues, and changed the `Max` parameter of the
  `Metrics/AbcSize` cop.
  Glitch-soc has different code and slightly higher `AbcSize` complexity,
  modified the `.rubocop_todo.yml` file accordingly.
- `app/policies/status_policy.rb`:
  Upstream changed `account.suspended?` to `account.unavailable?` to prepare
  for delete flags. Glitch-soc has additional local-only conditions.
  Ported upstream's refactor while keeping glitch-soc's additional condition.
- `app/serializers/initial_state_serializer.rb`:
  Upstream refactored a bunch of stuff while glitch-soc has more settings.
  Refactored as upstream did while keeping glitch-soc's settings.
2023-12-20 22:05:31 +01:00
Claire 5de551002d [Glitch] Fix onboarding step descriptions being truncated on narrow screens
Port b20af17a2c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-20 21:59:58 +01:00
Claire 8a5f2442cc Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream 2023-12-20 21:58:18 +01:00
Claire b41af99673 [Glitch] Change dismissed banners to be stored server-side
Port 7faa27e17d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-20 20:40:47 +01:00
Claire b8209c3b96 Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream reworked the CSP, we kept our version for now.
- `spec/requests/content_security_policy_spec.rb`:
  Upstream reworked the CSP, we kept our version for now.
2023-12-20 20:10:45 +01:00
Renaud Chaput a4a728b01d [Glitch] Fix the loading bar with the new Redux actions
Port 8b1eeb2f90 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-20 19:49:44 +01:00
Claire 93c71e2c7c [Glitch] Fix notification sounds
Port f3864db409 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-20 19:49:44 +01:00
Claire 70652e49eb [Glitch] Fix error when muting users from Web UI
Port 32319187ee to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-20 19:49:44 +01:00
Renaud Chaput e94fecdcc8 [Glitch] Fix the `notificationsUpdate` call
Port f476d9dab2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-20 19:49:44 +01:00
Renaud Chaput 79678cf841 [Glitch] Fixes website not loading for unlogged users
Port 6712bf86cd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-20 19:49:44 +01:00
Renaud Chaput 7fe5623a27 [Glitch] Use Immutable `Record` for accounts in Redux state
Port 3bf2a7296e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-20 19:49:44 +01:00
Renaud Chaput 3b7caa00e2 [Glitch] Add Typescript types for some API objects
Port 57f592fed5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-20 19:49:44 +01:00
Claire a3a58c041e
Merge pull request #2527 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 8ebc94dd22
2023-12-20 19:48:45 +01:00
Claire d29b1cca2e
Fix `friends_of_friends` sometimes suggesting already-followed accounts (#28433) 2023-12-20 14:35:59 +00:00
github-actions[bot] fecc07856c
New Crowdin Translations (automated) (#28439)
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-20 09:15:30 +00:00
Essem b7cb17fecf
Fix the poll option add button attempting to submit a form (#2530) 2023-12-20 08:24:28 +01:00
Claire 9bfb699c4c [Glitch] Change search popout to not list unusable search options when logged out
Port 6e70819840 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-19 21:25:55 +01:00
Claire b135b6ba8f Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
  Conflict caused by glitch-soc having a different file size limit constant
  name.
  Updated like upstream did while keeping glitch-soc's constant name.
2023-12-19 21:24:01 +01:00
Claire 2e786e13cb Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream
Conflicts:
- `app/validators/status_pin_validator.rb`:
  Upstream refactored that file, while glitch-soc had configurable limits for
  pinned statuses.
  Updated the code with upstream's refactor, while keeping glitch-soc's
  configurability.
2023-12-19 20:51:37 +01:00
Claire d288a6162a Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream 2023-12-19 20:40:05 +01:00
Claire 7db68e2dca [Glitch] Fix upper border radius of onboarding columns
Port 0a6ec048a8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-19 20:26:22 +01:00
Claire b24f676cf1 Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream 2023-12-19 20:24:57 +01:00
Jeong Arm 94c4c7f330 [Glitch] Fix open status on media modal
Port 922f086253 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-19 20:17:45 +01:00
Claire 3ad92e8d0d Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream 2023-12-19 20:17:23 +01:00
Claire 8afd313807 Merge commit '15b2d7eec59c745b418debf63907d8bd08c4a730' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Upstream split some dependencies, including `express`, to
  `streaming/package.json`.
  However, glitch-soc had extra dependencies textually close to `express`.
  Kept the extra dependencies and moved `express` to streaming.
- `yarn.lock`:
  Upstream split some dependencies, including `express`, to
  `streaming/package.json`.
  However, glitch-soc had extra dependencies textually close to `express`.
  Kept the extra dependencies and moved `express` to streaming.
2023-12-19 20:06:32 +01:00
Claire cd1e3ac2c7 Merge commit '7e1a77ea51e6dc4aecbf678f8928aa96698fa072' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/api/v1/timelines/public_controller.rb`:
  Upstream refactored this code, the conflict was because of an extra supported
  parameter, `allow_local_only`.
  Updated the controller to follow upstream's refactor, and moved the extra
  parameter definition accordingly.
2023-12-19 19:51:40 +01:00
Eugen Rochko b5ac61b2c5
Change algorithm of follow recommendations (#28314)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-12-19 10:59:43 +00:00
Matt Jankowski c28976d89e
Handle negative offset param in `api/v2/search` (#28282) 2023-12-19 10:55:39 +00:00
Renaud Chaput 7b1d390734
Fixes dropdown target without a `buttonRef` (edit history) (#28427) 2023-12-19 10:47:53 +00:00
github-actions[bot] fa987db738
New Crowdin Translations (automated) (#28423)
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-19 09:40:37 +00:00
Claire 3598c2e1db
Revert "Feature - Prevents multiple audio/video attachments from being played at the same time (#24717)" (#28251) 2023-12-19 05:08:52 +00:00
Renaud Chaput 8b1eeb2f90
Fix the loading bar with the new Redux actions (#28422) 2023-12-18 23:19:27 +00:00
Matt Jankowski 7cfc078198
Fix rails mailer preview not honouring locale (#28418) 2023-12-18 21:49:17 +00:00
Brian Holley 4259f4a4aa [Glitch] Fix "Hide these posts from home" list setting not refreshing when switching lists
Port 4aa06cbdbf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-18 20:59:33 +01:00
Claire a111fd7a0b Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream 2023-12-18 20:47:27 +01:00
pajowu 6261db2a26 [Glitch] Fix modal content not being selectable
Port ed79713f3a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-18 19:15:57 +01:00
Claire d6ad9d351e Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream 2023-12-18 19:10:43 +01:00
Claire 60eb57ce1b Fix HAML listing issue 2023-12-18 19:07:15 +01:00
Claire f5de9fe99a [Glitch] Allow viewing and severing relationships with suspended accounts
Port c451bbe249 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-18 18:49:48 +01:00
Aleks Xhuvani dee28c3fbf [Glitch] Do not try to update an undefined video element
Port 7840c6b75b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-18 18:42:30 +01:00
Aleks Xhuvani 372c455218 [Glitch] Add volume saving/reuse to video player
Port 58f01a5c9a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-18 18:42:07 +01:00
Claire b474cbbd28 Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/api/v1/accounts/relationships_controller.rb`:
  We differed by listing suspended users when requesting relationships.
  Updated to upstream's code.
2023-12-18 18:40:58 +01:00
Claire 46ddaffd40 Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream 2023-12-18 18:34:25 +01:00
Claire bc33be0342 Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`:
  Conflict because we had updated the `json-ld` gem to fix a yanked dependency.
  Kept our version of `json-ld` while updating other dependencies.
2023-12-18 18:07:24 +01:00
Claire 7d9b209fe8
Fix call to inefficient `delete_matched` cache method in domain blocks (#28374) 2023-12-18 16:14:43 +00:00
Claire 3d3fa75c81
Reduce composer differences with upstream and simplify code (#2518) 2023-12-18 13:20:08 +01:00
Matt Jankowski 1820bad646
Fix `Performance/StringIdentifierArgument` cop (#28399) 2023-12-18 10:26:09 +00:00
Matt Jankowski 2bd8d343cf
Fix `Style/SoleNestedConditional` and `Style/IfInsideElse` cops, regenerate haml todo (#28384) 2023-12-18 10:06:42 +00:00
Matt Jankowski 0e5b8fc46b
Fix `Style/RedundantReturn` cop (#28391) 2023-12-18 09:50:51 +00:00
github-actions[bot] f99e05710e
New Crowdin Translations (automated) (#28373)
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-18 08:25:21 +00:00
Claire 4113fbf6e8 Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream enforced new code style rules, where we had different code.
  Applied the new code style rules.
2023-12-17 23:04:16 +01:00
mogaminsk cc265f760e [Glitch] Fix inserting emojis from emoji picker fails with TypeError
Port ac8e4ed38d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-17 18:03:22 +01:00
Claire bb4fa0c374 [Glitch] Rewrite `AutosuggestTextarea` as Functional Component
Port 9c8891b39a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-17 17:59:33 +01:00
Renaud Chaput e22c3cd768 [Glitch] Improve Babel configuration and automatically load polyfills
Port 0e3401bc1c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-17 17:50:31 +01:00
Claire ddf3ad9541 Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main
Conflicts:
- `package.json`:
  Upstream removed a dependency textually close to a glitch-only dependency.
  Updated as upstream while keeping our dependency.
2023-12-17 17:43:30 +01:00
Claire f62bafc7a1 Fix HAML linting issue 2023-12-17 16:37:11 +01:00
Claire 1474318691 Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main
Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream fixed a bug in the trending post condition.
  Glitch-soc's condition is different because we potentially allow CWed content
  to trend.
  Ported upstream's fix while keeping glitch-soc's change.
- `config/initializers/content_security_policy.rb`:
  Kept our version for now, we will switch to upstream later down the road.
2023-12-17 15:32:29 +01:00
Matt Jankowski b1dec09d20
Fix `Style/InverseMethods` cop (#28377) 2023-12-15 15:52:00 +00:00
Matt Jankowski e17faedffb
Move default `meta` options from `InitialStateSerializer` to private method (AbcSize reduction) (#28355) 2023-12-14 14:04:55 +00:00
github-actions[bot] b2f915b31a
New Crowdin Translations (automated) (#28344)
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-13 09:52:37 +00:00
Claire dcc24db793
Fix N+1s because of association preloaders not actually getting called (#28339) 2023-12-13 07:47:32 +00:00
Claire 3f1ec16377
Fix empty column explainer getting cropped under certain conditions (#28337) 2023-12-12 14:31:37 +00:00
github-actions[bot] 14e64bc880
New Crowdin Translations (automated) (#28334)
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-12 11:45:10 +00:00
Claire 89a496b42f
Fix status edits not always being streamed to mentioned users (#28324) 2023-12-12 10:39:21 +00:00
Claire a8a5c6514f
Fix `LinkCrawlWorker` error when encountering empty OEmbed response (#28268) 2023-12-12 08:29:46 +00:00
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