Commit graph

11372 commits

Author SHA1 Message Date
Claire
87d2e00e66 [Glitch] Fix “Back” button sometimes redirecting out of Mastodon
Port 80fa2baa3d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-17 19:12:09 +02:00
Claire
cb70bb8665 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
Matt Jankowski
4bbb68d888 Fix haml-lint Rubocop Style/SlicingWithRange cop (#25947) 2023-07-17 18:18:13 +02:00
Claire
80fa2baa3d Fix “Back” button sometimes redirecting out of Mastodon (#25281) 2023-07-17 17:32:46 +02:00
Matt Jankowski
65d52af3e7 Fix haml-lint Rubocop Style/StringLiterals cop (#25948) 2023-07-17 16:57:18 +02:00
Jeong Arm
90a68ac5b5 Check if json body is null on Activitipub::ProcessingWorker (#26021) 2023-07-17 15:51:30 +02:00
Matt Jankowski
a522b40507 Fix haml-lint Rubocop Style/MinMaxComparison cop (#25974) 2023-07-17 15:38:04 +02:00
Matt Jankowski
af05a88ea8 Fix haml-lint Rubocop lambda cop (#25946) 2023-07-17 15:07:29 +02:00
Matt Jankowski
84c5baf149 Fix haml lint Rubocop Style/RedundantStringCoercion cop (#25975) 2023-07-17 14:08:56 +02:00
Claire
e8631f8e90 Remove unfollowed hashtag posts from home feed (#26028) 2023-07-17 13:56:28 +02:00
Michael Stanclift
df2d18c52a [Glitch] Fix for "follows you" indicator in light web UI not readable
Port 40e20d687a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-17 13:01:47 +02:00
Terence Eden
d2500a89fc [Glitch] Prevent split line between icon and number on reposts & favourites
Port 82b0cfce7e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-17 13:01:07 +02:00
Claire
0ef1efbe71 Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 12:52:15 +02:00
Claire
a75c14ffc0 Fix ArgumentError in mailers when a user's timezone is blank (#26025) 2023-07-17 12:10:50 +02:00
Michael Stanclift
40e20d687a Fix for "follows you" indicator in light web UI not readable (#25993) 2023-07-17 11:51:00 +02:00
Eugen Rochko
45a7291d2c Fix not actually connecting to the configured replica (#25977) 2023-07-17 08:26:52 +02:00
Claire
84c0f759d3 Reduce dropdown menu margin and padding (#2301)
* Reduce dropdown menu margin and padding

* Change horizontal padding back to what it was

* Reduce separator vertical margins for consistency
2023-07-16 18:23:07 +02:00
Terence Eden
82b0cfce7e Prevent split line between icon and number on reposts & favourites (#26004) 2023-07-16 10:06:33 +02:00
Claire
37e01f530b [Glitch] Change “About” and “Privacy policy” links to open in a new tab in advanced interface
Port 528a8d0cbe to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-14 13:01:31 +02:00
Stanislas Signoud
160af03565 [Glitch] Change links in multi-column mode so tabs are open in single-column mode
Port 663e9484e2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-14 13:01:31 +02:00
Claire
6a458a9baf Remove layout glitch-soc settings 2023-07-14 13:01:31 +02:00
Eugen Rochko
37e80ae4c8 [Glitch] Fix dropdowns being disabled for logged out users in web UI
Port 3df957104a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-14 13:01:31 +02:00
Claire
8d5e9e02e9 [Glitch] Fix embed dropdown menu item for unauthenticated users
Port 618eb10d18 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-13 22:42:15 +02:00
Claire
efa6d4416c Merge commit '528a8d0cbeaad7d73fc0dc310d4199701e0353a3' into glitch-soc/merge-upstream 2023-07-13 22:40:15 +02:00
Plastikmensch
7714478818 Fix notifications not loading when slow mode active (#2292)
When slow mode is enabled, clicking a notification filter when a new notification was received will render an empty column.

This change has been missed in f1de5093fb

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-13 21:36:15 +02:00
Claire
b27efe7c22 Fix home timeline's regexp field 2023-07-13 19:33:58 +02:00
Claire
528a8d0cbe Change “About” and “Privacy policy” links to open in a new tab in advanced interface (#25973) 2023-07-13 17:59:15 +02:00
Stanislas Signoud
663e9484e2 Change links in multi-column mode so tabs are open in single-column mode (#25893) 2023-07-13 17:18:09 +02:00
Claire
618eb10d18 Fix embed dropdown menu item for unauthenticated users (#25964) 2023-07-13 15:53:03 +02:00
Matt Jankowski
ecf7aa0fb3 Refactor Status.tagged_with_all for brakeman SQL injection warning (#25941) 2023-07-13 15:52:37 +02:00
Claire
c1bd8248c4 [Glitch] Fix follow link style in embeds
Port fc6d89573c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-13 14:52:36 +02:00
Renaud Chaput
e5f09f145a [Glitch] Upgrade to typescript-eslint v6
Port a09ed92a77 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-13 14:51:24 +02:00
Claire
90a0f97140 Fix incorrect types in DisplayName 2023-07-13 14:51:24 +02:00
Claire
3c714ea3d2 Merge commit 'fc6d89573cc6d07b8b82c096d1ee04c5f7909460' into glitch-soc/merge-upstream 2023-07-13 14:22:20 +02:00
Renaud Chaput
0e07aadfda [Glitch] Convert Home timeline components to Typescript
Port f8302ec345 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-13 14:21:08 +02:00
Claire
794ee87771 Merge commit '789459cea386e47870d457aa79a221392930095d' into glitch-soc/merge-upstream 2023-07-13 14:02:28 +02:00
Claire
385eb83893 [Glitch] Upgrade to Prettier 3
Port 9094a65fd4 to glitch-soc
2023-07-13 14:01:40 +02:00
Claire
268e955aef Merge commit '9094a65fd45f713bc66adf477c674ef7d33803a0' 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
Claire
c6212d89f8 Merge commit '9e6c02fd815253712c2e8ba1c1ebed092a007653' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/application_controller.rb:
  Upstream added an `include` where we had an extra `include` due to
  glitch-soc's theming system.
  Added upstream's new `include`.
2023-07-13 13:35:15 +02:00
Claire
fc6d89573c Fix follow link style in embeds (#25965) 2023-07-13 12:58:56 +02:00
Renaud Chaput
a09ed92a77 Upgrade to typescript-eslint v6 (#25904) 2023-07-13 11:49:16 +02:00
renovate[bot]
789459cea3 Update dependency rubocop-rails to v2.20.1 (#25493)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-07-13 11:44:02 +02:00
Renaud Chaput
f8302ec345 Convert Home timeline components to Typescript (#25583) 2023-07-13 11:28:55 +02:00
Renaud Chaput
9094a65fd4 Upgrade to Prettier 3 (#25902) 2023-07-13 11:26:45 +02:00
Michael Stanclift
9e5862608f Fix trending publishers table not rendering correctly on narrow screens (#25945) 2023-07-13 11:12:51 +02:00
Nick Schonning
1b1f9dff10 Update rubocop to v1.54.1 (#25627) 2023-07-13 11:11:55 +02:00
Matt Jankowski
5cdc196e44 Rails 7.0 update (#25668) 2023-07-13 09:36:07 +02:00
Claire
bd06bdf164 Fix various CSS issues 2023-07-12 19:13:31 +02:00
Eugen Rochko
8bc36b5084 Change markers API to use a replica (#25851) 2023-07-12 18:57:40 +02:00
Eugen Rochko
315002c1be Change notifications API to use a replica (#25874) 2023-07-12 17:06:00 +02:00