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.
1 year ago
4bbb68d888
Fix haml-lint Rubocop `Style/SlicingWithRange` cop ( #25947 )
1 year ago
80fa2baa3d
Fix “Back” button sometimes redirecting out of Mastodon ( #25281 )
1 year ago
65d52af3e7
Fix haml-lint Rubocop `Style/StringLiterals` cop ( #25948 )
1 year ago
90a68ac5b5
Check if json body is null on Activitipub::ProcessingWorker ( #26021 )
1 year ago
a522b40507
Fix haml-lint Rubocop `Style/MinMaxComparison` cop ( #25974 )
1 year ago
af05a88ea8
Fix haml-lint Rubocop `lambda` cop ( #25946 )
1 year ago
84c5baf149
Fix haml lint Rubocop `Style/RedundantStringCoercion` cop ( #25975 )
1 year ago
e8631f8e90
Remove unfollowed hashtag posts from home feed ( #26028 )
1 year ago
df2d18c52a
[Glitch] Fix for "follows you" indicator in light web UI not readable
...
Port 40e20d687a
1 year ago
d2500a89fc
[Glitch] Prevent split line between icon and number on reposts & favourites
...
Port 82b0cfce7e
1 year ago
0ef1efbe71
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
a75c14ffc0
Fix ArgumentError in mailers when a user's timezone is blank ( #26025 )
1 year ago
40e20d687a
Fix for "follows you" indicator in light web UI not readable ( #25993 )
1 year ago
45a7291d2c
Fix not actually connecting to the configured replica ( #25977 )
1 year ago
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
1 year ago
82b0cfce7e
Prevent split line between icon and number on reposts & favourites ( #26004 )
1 year ago
37e01f530b
[Glitch] Change “About” and “Privacy policy” links to open in a new tab in advanced interface
...
Port 528a8d0cbe
1 year ago
160af03565
[Glitch] Change links in multi-column mode so tabs are open in single-column mode
...
Port 663e9484e2
1 year ago
6a458a9baf
Remove layout glitch-soc settings
1 year ago
37e80ae4c8
[Glitch] Fix dropdowns being disabled for logged out users in web UI
...
Port 3df957104a
1 year ago
8d5e9e02e9
[Glitch] Fix embed dropdown menu item for unauthenticated users
...
Port 618eb10d18
1 year ago
efa6d4416c
Merge commit '528a8d0cbeaad7d73fc0dc310d4199701e0353a3' into glitch-soc/merge-upstream
1 year ago
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
1 year ago
b27efe7c22
Fix home timeline's regexp field
1 year ago
528a8d0cbe
Change “About” and “Privacy policy” links to open in a new tab in advanced interface ( #25973 )
1 year ago
663e9484e2
Change links in multi-column mode so tabs are open in single-column mode ( #25893 )
1 year ago
618eb10d18
Fix embed dropdown menu item for unauthenticated users ( #25964 )
1 year ago
ecf7aa0fb3
Refactor `Status.tagged_with_all` for brakeman SQL injection warning ( #25941 )
1 year ago
c1bd8248c4
[Glitch] Fix follow link style in embeds
...
Port fc6d89573c
1 year ago
e5f09f145a
[Glitch] Upgrade to `typescript-eslint` v6
...
Port a09ed92a77
1 year ago
90a0f97140
Fix incorrect types in DisplayName
1 year ago
3c714ea3d2
Merge commit 'fc6d89573cc6d07b8b82c096d1ee04c5f7909460' into glitch-soc/merge-upstream
1 year ago
0e07aadfda
[Glitch] Convert Home timeline components to Typescript
...
Port f8302ec345
1 year ago
794ee87771
Merge commit '789459cea386e47870d457aa79a221392930095d' into glitch-soc/merge-upstream
1 year ago
385eb83893
[Glitch] Upgrade to Prettier 3
...
Port 9094a65fd4
1 year ago
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.
1 year ago
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`.
1 year ago
fc6d89573c
Fix follow link style in embeds ( #25965 )
1 year ago
a09ed92a77
Upgrade to `typescript-eslint` v6 ( #25904 )
1 year ago
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>
1 year ago
f8302ec345
Convert Home timeline components to Typescript ( #25583 )
1 year ago
9094a65fd4
Upgrade to Prettier 3 ( #25902 )
1 year ago
9e5862608f
Fix trending publishers table not rendering correctly on narrow screens ( #25945 )
1 year ago
1b1f9dff10
Update rubocop to v1.54.1 ( #25627 )
1 year ago
5cdc196e44
Rails 7.0 update ( #25668 )
1 year ago
bd06bdf164
Fix various CSS issues
1 year ago
8bc36b5084
Change markers API to use a replica ( #25851 )
1 year ago
315002c1be
Change notifications API to use a replica ( #25874 )
1 year ago
1399e9d863
Merge commit '6ee7c03b282663700b2e3f2f83b57b163aac2a35' into glitch-soc/merge-upstream
...
Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
Upstream ran a lint fix on this file, but this file is different in
glitch-soc because the feature was added much earlier.
Ran the lint fix on our own version of the file.
1 year ago
Claire
Matt Jankowski
Jeong Arm
Michael Stanclift
Terence Eden
Eugen Rochko
Stanislas Signoud
Plastikmensch
Renaud Chaput
renovate[bot]
Nick Schonning