mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,627 Commits
69 Branches
21 Tags
340 MiB
Commit Graph

21627 Commits (e62595c9667151ec5038da9232639c97250f9c64)

Author SHA1 Message Date
Claire 7f404fd635 Merge commit '90eb4a5d01f1f1e8a76e7dc814eae992a9c1ee16' into glitch-soc/merge-upstream 2024-05-01 16:47:25 +02:00
Renaud Chaput b3d5567bd0 [Glitch] Remove global `boosts` state and convert boosts modal to Typescript 
Port 67442f9039 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 16:42:20 +02:00
Claire 0f90e624c5 Merge commit '672c9f5f05bde788877ae0dcdb6668366c4c8941' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Conflict due to our theming system being different.
  Ported upstream's changes.
 2024-05-01 16:10:45 +02:00
Claire bc370938ef [Glitch] Fix logo pushing header buttons out of view on certain conditions in mobile layout 
Port 4f068d4fcc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 15:56:38 +02:00
Renaud Chaput cc720cd38f [Glitch] Fix `<RelativeTimestamp>` types 
Port 961bb84e4c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 15:56:37 +02:00
Renaud Chaput 0ab212f6a9 [Glitch] Fix props for `<Button>` 
Port d088964761 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 15:56:37 +02:00
Renaud Chaput 02f9ce9ce3 [Glitch] Fix PropTypes for some record objects 
Port f2fd1da23f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 15:56:37 +02:00
Claire 5cb4adbf4e [Glitch] Fix language picker and privacy picker not having a backdrop filter 
Port c913e2f3e5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 15:56:37 +02:00
Renaud Chaput 555f45f249 [Glitch] Fix notifications marker fetch 
Port b9982ce578 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 15:56:37 +02:00
Renaud Chaput 371c5e59eb [Glitch] Rewrite PIP state in Typescript 
Port 9fbe8d3a0c to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 15:56:37 +02:00
Renaud Chaput 059e10e546 [Glitch] Rewrite markers reducer in Typescript 
Port 27d014a7fa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 14:55:03 +02:00
Claire 3f61981f5d Merge commit '8a498f4e65ecf27cc2c992d02b47f890dafef20b' into glitch-soc/merge-upstream 2024-05-01 14:50:16 +02:00
Claire 03af271d3d [Glitch] Fix column borders disappearing in advanced interface on low width viewports 
Port b2d841ce9a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 14:32:29 +02:00
Claire 7b46517c38 Merge commit 'd49343ed11b3c08c4e81ecd70e17e01bd30154a6' into glitch-soc/merge-upstream 2024-05-01 14:31:14 +02:00
Renaud Chaput d63c0a2879 [Glitch] Support "system" theme setting (light/dark theme depending on user system preference) 
Port 02ea161506 to glitch-soc

Co-authored-by: Nishiki Liu <hello@nshki.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-01 14:25:51 +02:00
Claire a6147a831f Merge commit '02ea16150647ac3baf0bb8a89203ccc7200b4a2f' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/themes.rb`
- `app/views/layouts/application.html.haml`
- `app/views/layouts/embedded.html.haml`
- `app/views/layouts/error.html.haml`
- `config/settings.yml`

All these conflicts are because glitch-soc and upstream have different theming
systems and upstream changed a few things to have dynamic theme selection based
on system settings.

Conflicts were solved to take that into account, and `current_theme` has been
changed in the process to return a tuple of `[flavour, skin]` to be used in
the `theme_style_tags` helper.
 2024-05-01 14:25:47 +02:00
Claire 3024212403
Merge pull request #2698 from ClearlyClaire/glitch-soc/refactor/index-application 
Rename `app/javascript/flavours/glitch/styles/index.scss` to `application.scss`
 2024-05-01 13:09:43 +02:00
Claire 26e10aa203
Change width breakpoint for mobile placement behavior (#30131) 2024-04-30 23:39:28 +00:00
Claire d6048d3a6c Add compatibility `app/javascript/flavours/glitch/styles/index.scss` 2024-04-30 21:27:04 +02:00
Claire 8a34c42341 Rename `app/javascript/flavours/glitch/styles/index.scss` to `application.scss` 
This is just to reduce differences with upstream.
 2024-04-30 21:03:04 +02:00
Claire 6f74ede26b
Merge pull request #2697 from ClearlyClaire/glitch-soc/refactor/revamp-theming-system 
Simplify glitch-soc's theming system
 2024-04-30 20:41:38 +02:00
Matt Jankowski 75470f1256
Use implicit dotenv load (#30121) 2024-04-30 13:00:39 +00:00
renovate[bot] f3ea90b89e
Update workbox monorepo to v7.1.0 (#30047) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-30 09:12:25 +00:00
github-actions[bot] 56821ed879
New Crowdin Translations (automated) (#30128) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-30 09:05:53 +00:00
Shlee 40d7a553d2
Minor phrasing on tootcli statuses remove (#30122) 2024-04-30 08:51:39 +00:00
renovate[bot] f5376c477d
Update babel monorepo to v7.24.5 (#30124) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-30 08:50:42 +00:00
Emelia Smith 81f0002e76
Fix missing destory audit logs for Domain Allows (#30125) 2024-04-30 08:48:02 +00:00
Shlee b8f0a50435
docker-compose.yml `version` is obsolete (#30120) 2024-04-29 17:31:14 +00:00
renovate[bot] f5d6362e90
Update dependency ws to v8.17.0 (#30097) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-29 15:48:34 +00:00
Matt Jankowski 924af400da
Remove unused memoization in `CustomFilter#expires_in` method (#30117) 2024-04-29 12:49:31 +00:00
Matt Jankowski f1a4b4e228
Disable `Style/SignalException` cop (#30064) 2024-04-29 12:32:06 +00:00
Claire 7d3fe2b4c3
Add loading indicator and empty result message to advanced interface search (#30085) 2024-04-29 09:55:41 +00:00
Matt Jankowski ac7f4d57bb
Use composable query in `Status.without_replies` scope (#30086) 2024-04-29 09:55:37 +00:00
Claire 95e9de5777
Prevent accidental serialization of `Account` and `User` records (#30079) 2024-04-29 09:45:58 +00:00
Matt Jankowski e336466894
Use shared form partial for `admin/rules` views (#30067) 2024-04-29 09:33:27 +00:00
Matt Jankowski a9816f051d
Use shared form partial for `admin/warning_presets` views (#30069) 2024-04-29 09:33:06 +00:00
Renaud Chaput b9b4db483c
Remove usage of deprecated `defaultTypes` on React functional components (#30099) 2024-04-29 09:29:59 +00:00
Matt Jankowski 2739d8d5a4
Use shorter `render` call in `admin/webhooks` view (#30071) 2024-04-29 09:10:23 +00:00
Matt Jankowski bbf1b603e0
Remove unused `Account.popular` scope (#30068) 2024-04-29 09:04:35 +00:00
renovate[bot] 6931cf5727
Update dependency aws-sdk-s3 to v1.148.0 (#30076) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-29 09:03:27 +00:00
Matt Jankowski 2123281f7c
Move `Account` limits to constants (#30087) 2024-04-29 09:02:47 +00:00
Matt Jankowski f0c9cbaf3b
Use `EXPIRATION_DURATIONS` constant in `CustomFilter` class (#30088) 2024-04-29 09:01:46 +00:00
Renaud Chaput 4527e012da
Convert `entrypoints/sign_up` to Typescript (#30106) 2024-04-29 08:23:05 +00:00
github-actions[bot] 9be7efedf0
New Crowdin Translations (automated) (#30092) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-29 08:15:43 +00:00
renovate[bot] 00aec2f33a
Update peter-evans/create-pull-request action to v6.0.5 (#30112) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-29 08:10:20 +00:00
renovate[bot] 0efa9854a1
Update libretranslate/libretranslate Docker tag to v1.5.7 (#30111) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-29 08:10:04 +00:00
renovate[bot] 23223369e0
Update eslint (non-major) (#30110) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-29 08:09:50 +00:00
renovate[bot] c0584a6f4f
Update devDependencies (non-major) (#30109) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-29 08:09:27 +00:00
renovate[bot] 31f3dd57e0
Update dependency rubocop to v1.63.4 (#30096) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-29 08:08:58 +00:00
renovate[bot] d8a4cea41b
Update dependency haml_lint to v0.58.0 (#30094) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-29 08:08:43 +00:00