Commit Graph

1532 Commits

Author SHA1 Message Date
c04f2d0cf7 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  had a different lambda due to its theming system.
  Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  removed some code just after the lambda.
  Applied the same code style changes.
2023-07-17 19:02:23 +02:00
a442a1d1c6 Fix “Back” button sometimes redirecting out of Mastodon (#25281) 2023-07-17 17:32:46 +02:00
d9adda1a99 Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream 2023-07-13 22:40:15 +02:00
71db616fed Change “About” and “Privacy policy” links to open in a new tab in advanced interface (#25973) 2023-07-13 17:59:15 +02:00
5fad7bd58a Change links in multi-column mode so tabs are open in single-column mode (#25893) 2023-07-13 17:18:09 +02:00
41f65edb21 Fix embed dropdown menu item for unauthenticated users (#25964) 2023-07-13 15:53:03 +02:00
25571b18ed Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream 2023-07-13 14:22:20 +02:00
447ab7ab24 [Glitch] Convert Home timeline components to Typescript
Port a75138d073 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-13 14:21:08 +02:00
177497b367 Merge commit '3ed9b55cb3987e3d32c56f857cb6903ca8bec3d4' into glitch-soc/merge-upstream 2023-07-13 14:02:28 +02:00
95a1fde6b6 Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
  Upstream updated the linter, which changed a few linter rules.
  Some of those changed lines are different in glitch-soc because we use
  different paths for the assets.
  Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
  Upstream updated the linter, which changed a few linter rules.
  Some of those changed lines are different in glitch-soc because we use
  different paths for the assets.
  Applied the same style rules on our version of the file.
2023-07-13 13:49:58 +02:00
a7253075d1 Upgrade to typescript-eslint v6 (#25904) 2023-07-13 11:49:16 +02:00
a75138d073 Convert Home timeline components to Typescript (#25583) 2023-07-13 11:28:55 +02:00
73b64b8917 Upgrade to Prettier 3 (#25902) 2023-07-13 11:26:45 +02:00
075887e1d6 Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream 2023-07-12 15:44:33 +02:00
82eebd0482 Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream renamed an initial state parameter, where we had extra ones.
  Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
  Upstream wrapped database query in a block, we had extra database
  queries because of the DM timeline.
  Moved everything in the block.
2023-07-12 15:27:32 +02:00
7e54a30f06 Merge commit '4534498a8e43f59980ee56e9938efab8580c78c8' into glitch-soc/merge-upstream 2023-07-12 15:00:41 +02:00
67055b0343 Fix import order inconsistencies (#2289) 2023-07-12 15:00:10 +02:00
ea10febd25 fix buttons showing inconsistent styles (#25903) 2023-07-11 12:26:09 +02:00
af54bf52c8 Fix filters not applying to explore tab (#25887) 2023-07-10 19:33:07 +02:00
c27b82a437 Add forward_to_domains parameter to POST /api/v1/reports (#25866) 2023-07-10 18:26:56 +02:00
a7ca33ad96 Add toast with option to open post after publishing in web UI (#25564) 2023-07-08 20:01:08 +02:00
a8edbcf963 Fix dropdowns being disabled for logged out users in web UI (#25714) 2023-07-08 20:00:52 +02:00
ceeb2b8c41 Fix explore page being inaccessible when opted-out of trends in web UI (#25716) 2023-07-08 20:00:12 +02:00
4534498a8e Convert <DismissableBanner> to Typescript (#25582) 2023-07-08 11:12:20 +02:00
20e85c0e83 Rewrite <ShortNumber /> as FC and TS (#25492) 2023-07-08 11:11:58 +02:00
e0d230fb37 simplify counters (#25541) 2023-07-08 11:11:22 +02:00
5de49e74d4 Merge branch 'main' into glitch-soc/merge-upstream 2023-07-05 12:01:26 +02:00
000b835803 Add canonical link tags in web UI (#25715) 2023-07-05 11:25:27 +02:00
6268188543 Fix local live feeds does not expand (#25694) 2023-07-04 00:37:57 +02:00
54a10523e2 Change labels of live feeds tabs in web UI (#25683) 2023-07-03 22:57:18 +02:00
44e98a2740 Merge branch 'main' into glitch-soc/merge-upstream 2023-07-02 11:49:08 +02:00
5b46345459 Prevent duplicate concurrent calls of /api/*/instance in web UI (#25663) 2023-07-02 11:12:16 +02:00
0512537eb6 Change dropdown icon above compose form from ellipsis to bars in web UI (#25661) 2023-07-02 10:39:55 +02:00
cea9db5a0b Change local and federated timelines to be in a single firehose column (#25641) 2023-07-02 00:05:10 +02:00
9934949fc4 Fix onboarding prompt being displayed because of disconnection gaps (#25617) 2023-06-30 16:32:12 +02:00
285a691936 Remove the search button from UI header when logged out (#25631) 2023-06-28 14:57:51 +02:00
80a5c16ae1 Merge branch 'main' into glitch-soc/merge-upstream 2023-06-27 13:15:41 +02:00
ae30a60b1f Improve dismissable banner buttons when they dont fit on 1 line (#25580)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-26 12:31:48 +02:00
65aa04647a Fix onboarding prompt flashing while home feed is loading in web UI (#25579) 2023-06-26 05:26:54 +02:00
2b78c07ef1 Fix search not being easily findable on smaller screens in web UI (#25576) 2023-06-26 05:26:41 +02:00
178e151019 Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream
Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a constraint on a setting textually close
  to glitch-soc-only settings.
  Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for the `translate` attribute on a few elements,
  where glitch-soc had a different set of allowed elements and attributes.
  Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored to use RSpec's `instance_double` instead of `double`,
  but glitch-soc had changes to tests due to configurable max toot chars.
  Applied upstream's changes while keeping tests against configurable max
  toot chars.
2023-06-25 14:27:38 +02:00
a985d587e1 Change labels and styles on the onboarding screen in web UI (#25559) 2023-06-23 16:34:27 +02:00
0842a68532 Remove unique accounts condition from Home onboarding prompt (#25556) 2023-06-23 14:44:54 +02:00
00ec43914a Add onboarding prompt when home feed too slow in web UI (#25267) 2023-06-22 23:48:40 +02:00
a8c1c8bd37 Fix j/k keyboard shortcuts on some status lists (#25554) 2023-06-22 17:54:43 +02:00
8d2c26834f Fix custom signup URL may not loaded (#25531) 2023-06-22 12:10:49 +02:00
Ian
69db507924 Change emoji picker icon (#25479) 2023-06-21 17:58:00 +02:00
6c99479ef4 Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
  Upstream redesigned the settings page, where glitch-soc had changes because of
  the ability to set some custom limits.
  Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
  Upstream updated dependencies textually close to a glitch-soc-only dependency.
  Updated the dependnencies as well.
2023-06-18 13:41:33 +02:00
65cbcce997 Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream 2023-06-18 10:36:14 +02:00
c9d06d10d4 Fix non-interactive upload container being given a button role and tabIndex (#25462) 2023-06-16 12:03:06 +02:00