tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,682 Commits 10 Branches 0 Tags
e48a6a5f2c878e0deecddbd92ba4d823bebd7f9e
Commit Graph

18682 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
1a33f1df17 Merge pull request #2305 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-07-17 21:06:58 +02:00
Claire
0c45bed333 [Glitch] Fix “Back” button sometimes redirecting out of Mastodon 
Port a442a1d1c6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-17 19:12:09 +02:00
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.
 2023-07-17 19:02:23 +02:00
Claire
0e1d2e15a3 Merge pull request #2302 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-07-17 18:58:40 +02:00
Matt Jankowski
4207c95d4f Fix haml-lint Rubocop Style/SlicingWithRange cop (#25947) 2023-07-17 18:18:13 +02:00
Claire
a442a1d1c6 Fix “Back” button sometimes redirecting out of Mastodon (#25281) 2023-07-17 17:32:46 +02:00
Matt Jankowski
d0f00206dc Fix haml-lint Rubocop Style/StringLiterals cop (#25948) 2023-07-17 16:57:18 +02:00
Daniel M Brasil
19208aa422 Migrate to request specs in /api/v1/statuses/:status_id/favourite (#25626) 2023-07-17 16:53:57 +02:00
Daniel M Brasil
6fb4a756ff Migrate to request specs in /api/v1/statuses/:status_id/bookmark (#25624) 2023-07-17 16:51:49 +02:00
Daniel M Brasil
4859958a0c Migrate to request specs in /api/v1/polls (#25596) 2023-07-17 16:50:00 +02:00
Daniel M Brasil
1aea938d3d Migrate to request specs in /api/v1/statuses/:status_id/pin (#25635) 2023-07-17 16:24:05 +02:00
Daniel M Brasil
6cdc8408a9 Migrate to request specs in /api/v1/emails/confirmations (#25686) 2023-07-17 16:22:33 +02:00
Daniel M Brasil
8a1aabaac1 Migrate to request specs in /api/v1/timelines/home (#25743) 2023-07-17 16:20:11 +02:00
Nick Schonning
c80ecf2ff7 Increase PR Rebase job retries (#25926) 2023-07-17 16:10:43 +02:00
Jeong Arm
664b0ca8cb Check if json body is null on Activitipub::ProcessingWorker (#26021) 2023-07-17 15:51:30 +02:00
Matt Jankowski
bd33efdf16 Fix haml-lint Rubocop Style/MinMaxComparison cop (#25974) 2023-07-17 15:38:04 +02:00
Matt Jankowski
361dd43235 Fix haml-lint Rubocop lambda cop (#25946) 2023-07-17 15:07:29 +02:00
Matt Jankowski
5096deb818 Fix haml lint Rubocop Style/RedundantStringCoercion cop (#25975) 2023-07-17 14:08:56 +02:00
renovate[bot]
2a9063e36a Update dependency react-select to v5.7.4 (#26033) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-07-17 14:07:36 +02:00
Claire
943f27f437 Remove unfollowed hashtag posts from home feed (#26028) 2023-07-17 13:56:28 +02:00
Claire
f18618d7f9 Fix some incorrect tests (#26035) 2023-07-17 13:13:43 +02:00
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>
 2023-07-17 13:01:47 +02:00
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>
 2023-07-17 13:01:07 +02:00
Claire
c943f17b1b Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 12:52:15 +02:00
renovate[bot]
626f9cf831 Update dependency public_suffix to v5.0.3 (#26032) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-07-17 12:40:54 +02:00
Nick Schonning
bf9c1a65fa Update rubocop 1.54.2 (#26002) 2023-07-17 12:40:27 +02:00
renovate[bot]
cf18bfa090 Update dependency aws-sdk-s3 to v1.130.0 (#25967) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-07-17 12:39:50 +02:00
fusagiko / takayamaki
ee8c8dbc6f remove some file paths from rubocop_tobo.yml (#26022) 2023-07-17 12:15:32 +02:00
renovate[bot]
7b7a26c895 Update dependency postcss to v8.4.26 (#26030) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-07-17 12:13:01 +02:00
Claire
c667fc5a4a Fix ArgumentError in mailers when a user's timezone is blank (#26025) 2023-07-17 12:10:50 +02:00
Michael Stanclift
97ce47e451 Fix for "follows you" indicator in light web UI not readable (#25993) 2023-07-17 11:51:00 +02:00
renovate[bot]
f17acbca33 Update dependency immutable to v4.3.1 (#26029) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-07-17 11:39:35 +02:00
renovate[bot]
cdaca7a08b Update babel monorepo to v7.22.9 (#26017) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-07-17 09:38:11 +02:00
Renaud Chaput
84ce94b100 Try to improve Renovatebot config (#26005) 2023-07-17 09:33:22 +02:00
Eugen Rochko
26e522ac55 Fix not actually connecting to the configured replica (#25977) 2023-07-17 08:26:52 +02:00
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
 2023-07-16 18:23:07 +02:00
Terence Eden
b923a4c755 Prevent split line between icon and number on reposts & favourites (#26004) 2023-07-16 10:06:33 +02:00
Claire
2f6ac6b432 Merge pull request #2300 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-07-14 18:39:37 +02:00
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>
 2023-07-14 13:01:31 +02:00
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>
 2023-07-14 13:01:31 +02:00
Claire
0d61985713 Remove layout glitch-soc settings 2023-07-14 13:01:31 +02:00
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>
 2023-07-14 13:01:31 +02:00
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>
 2023-07-13 22:42:15 +02:00
Claire
d9adda1a99 Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream 2023-07-13 22:40:15 +02:00
Plastikmensch
a0047184d7 Add eslint rule to forbid vanilla imports in glitch (#2293) 
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-07-13 21:36:23 +02:00
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>
 2023-07-13 21:36:15 +02:00
Claire
3952d17518 Merge pull request #2296 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-07-13 21:35:07 +02:00
Claire
e271d018b7 Fix home timeline's regexp field 2023-07-13 19:33:58 +02:00
Claire
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
Stanislas Signoud
5fad7bd58a Change links in multi-column mode so tabs are open in single-column mode (#25893) 2023-07-13 17:18:09 +02:00