Claire
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.
1 year ago
Matt Jankowski
4207c95d4f
Fix haml-lint Rubocop `Style/SlicingWithRange` cop ( #25947 )
1 year ago
Claire
a442a1d1c6
Fix “Back” button sometimes redirecting out of Mastodon ( #25281 )
1 year ago
Matt Jankowski
d0f00206dc
Fix haml-lint Rubocop `Style/StringLiterals` cop ( #25948 )
1 year ago
Jeong Arm
664b0ca8cb
Check if json body is null on Activitipub::ProcessingWorker ( #26021 )
1 year ago
Matt Jankowski
bd33efdf16
Fix haml-lint Rubocop `Style/MinMaxComparison` cop ( #25974 )
1 year ago
Matt Jankowski
361dd43235
Fix haml-lint Rubocop `lambda` cop ( #25946 )
1 year ago
Matt Jankowski
5096deb818
Fix haml lint Rubocop `Style/RedundantStringCoercion` cop ( #25975 )
1 year ago
Claire
943f27f437
Remove unfollowed hashtag posts from home feed ( #26028 )
1 year ago
Michael Stanclift
12e7f5fabd
[Glitch] Fix for "follows you" indicator in light web UI not readable
...
Port 97ce47e451
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Terence Eden
27f7e5b0f3
[Glitch] Prevent split line between icon and number on reposts & favourites
...
Port b923a4c755
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Claire
c943f17b1b
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
Claire
c667fc5a4a
Fix ArgumentError in mailers when a user's timezone is blank ( #26025 )
1 year ago
Michael Stanclift
97ce47e451
Fix for "follows you" indicator in light web UI not readable ( #25993 )
1 year ago
Eugen Rochko
26e522ac55
Fix not actually connecting to the configured replica ( #25977 )
1 year ago
Claire
23197cebce
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
Terence Eden
b923a4c755
Prevent split line between icon and number on reposts & favourites ( #26004 )
1 year ago
Claire
c45a965bf7
[Glitch] Change “About” and “Privacy policy” links to open in a new tab in advanced interface
...
Port 71db616fed
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Stanislas Signoud
9bd012b7cb
[Glitch] Change links in multi-column mode so tabs are open in single-column mode
...
Port 5fad7bd58a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Claire
0d61985713
Remove layout glitch-soc settings
1 year ago
Eugen Rochko
f0d3267fbf
[Glitch] Fix dropdowns being disabled for logged out users in web UI
...
Port a8edbcf963
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Claire
a98b5c2246
[Glitch] Fix embed dropdown menu item for unauthenticated users
...
Port 41f65edb21
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Claire
d9adda1a99
Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream
1 year ago
Plastikmensch
470ded3687
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 e91bf82083
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
1 year ago
Claire
e271d018b7
Fix home timeline's regexp field
1 year ago
Claire
71db616fed
Change “About” and “Privacy policy” links to open in a new tab in advanced interface ( #25973 )
1 year ago
Stanislas Signoud
5fad7bd58a
Change links in multi-column mode so tabs are open in single-column mode ( #25893 )
1 year ago
Claire
41f65edb21
Fix embed dropdown menu item for unauthenticated users ( #25964 )
1 year ago
Matt Jankowski
644c5fddd8
Refactor `Status.tagged_with_all` for brakeman SQL injection warning ( #25941 )
1 year ago
Claire
98e5589ed4
[Glitch] Fix follow link style in embeds
...
Port 5a3f174d56
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Renaud Chaput
18f55567b0
[Glitch] Upgrade to `typescript-eslint` v6
...
Port a7253075d1
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Claire
3be4f4266d
Fix incorrect types in DisplayName
1 year ago
Claire
25571b18ed
Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream
1 year ago
Renaud Chaput
447ab7ab24
[Glitch] Convert Home timeline components to Typescript
...
Port a75138d073
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Claire
177497b367
Merge commit '3ed9b55cb3987e3d32c56f857cb6903ca8bec3d4' into glitch-soc/merge-upstream
1 year ago
Claire
0870c7c95e
[Glitch] Upgrade to Prettier 3
...
Port 73b64b8917
to glitch-soc
1 year ago
Claire
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.
1 year ago
Claire
2d09653d50
Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' 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
Claire
5a3f174d56
Fix follow link style in embeds ( #25965 )
1 year ago
Renaud Chaput
a7253075d1
Upgrade to `typescript-eslint` v6 ( #25904 )
1 year ago
renovate[bot]
3ed9b55cb3
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
Renaud Chaput
a75138d073
Convert Home timeline components to Typescript ( #25583 )
1 year ago
Renaud Chaput
73b64b8917
Upgrade to Prettier 3 ( #25902 )
1 year ago
Michael Stanclift
063482a63f
Fix trending publishers table not rendering correctly on narrow screens ( #25945 )
1 year ago
Nick Schonning
1a6c2e450a
Update rubocop to v1.54.1 ( #25627 )
1 year ago
Matt Jankowski
ce43ed144c
Rails 7.0 update ( #25668 )
1 year ago
Claire
c2bfbf53a1
Fix various CSS issues
1 year ago
Eugen Rochko
8d0c69529a
Change markers API to use a replica ( #25851 )
1 year ago
Eugen Rochko
fdc3ff7c2d
Change notifications API to use a replica ( #25874 )
1 year ago
Claire
9ae60f8738
Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' 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