monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,473 Commits 1 Branch 0 Tags 261 MiB
Commit Graph

11909 Commits

Author SHA1 Message Date
Eugen Rochko 69ea596e55 [Glitch] Fix explore page reloading when you navigate back to it in web UI 
Port d9503a1965 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-24 19:22:39 +02:00
Claire e6c3d3c744 Merge commit 'd9503a1965a16328b62ea7bf0bb54e87cbe30d29' into glitch-soc/merge-upstream 2023-10-24 19:21:01 +02:00
Claire 57c0de949b Merge commit '8b770ce8110e6cd609a6769c66210d95e291e3e5' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream changed how asset host CSP directives are used, and glitch-soc has
  a pretty different CSP file.
  It may be worth reconsidering the differences between upstream and glitch-soc
  but for now, just port the change.
 2023-10-24 19:17:20 +02:00
Claire 787d5ad386 Merge commit 'bcae7442757845191c0e82b61cd1d0cd3ca860d1' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Caused by a glitch-soc-only dependency (`exif-js`).
  Kept it.
 2023-10-24 19:05:18 +02:00
Claire 5323f0eeca [Glitch] Fix incorrect proptypes from react-router-v5 update 
Port 0ad66175bf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-24 19:03:16 +02:00
Renaud Chaput 9325cb5759 [Glitch] Convert `<Button>` to Typescript 
Port 9d45a444f9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-24 19:03:16 +02:00
Eugen Rochko 1138d44c7d [Glitch] Fix missing background behind dismissable banner in web UI 
Port 33bd8eccd5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-24 18:46:08 +02:00
Claire b0c76eaadd Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream changed one import, close to a glitch-soc-only import to handle
  different max character counts.
  Ported upstream's change.
 2023-10-24 18:41:20 +02:00
Eugen Rochko d9503a1965
Fix explore page reloading when you navigate back to it in web UI (#27489) 2023-10-23 17:07:13 +02:00
Claire 8b770ce811
Add warnings to report action logs (#27425) 2023-10-23 14:30:46 +02:00
Claire 99f2534cee
Add support for displaying unknown servers on /admin/instances/:domain (#27150) 2023-10-23 14:27:57 +02:00
Claire bcae744275
Fix some link anchors being recognized as hashtags (#27271) 2023-10-23 14:19:38 +02:00
Claire 0ad66175bf
Fix incorrect proptypes from react-router-v5 update (#27507) 2023-10-23 11:39:53 +02:00
github-actions[bot] 70fd819935
New Crowdin Translations (automated) (#27490) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-23 10:04:54 +02:00
Matt Jankowski b0213472df
Validate allowed schemes on preview card URLs (#27485) 2023-10-23 09:50:02 +02:00
Renaud Chaput 9d45a444f9
Convert `<Button>` to Typescript (#27492) 2023-10-23 09:43:00 +02:00
Renaud Chaput d6eacb79c6 [Glitch] Upgrade to react-router v5 
Port 1b70d7ed7c to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-21 22:14:24 +02:00
Claire 245513d630 Merge commit '1b70d7ed7c0fd3a9fcf028bf76b8c62ac8b3897f' into glitch-soc/merge-upstream 2023-10-21 14:33:33 +02:00
Matt Jankowski ab0fb81479
Configure brakeman to ignore url safe preview card urls (#25883) 2023-10-20 15:32:16 +02:00
Claire 13688539bc
Fix processing LDSigned activities from actors with unknown public keys (#27474) 2023-10-20 10:45:46 +02:00
github-actions[bot] 284c719f64
New Crowdin Translations (automated) (#27480) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-20 10:11:40 +02:00
Eugen Rochko 33bd8eccd5
Fix missing background behind dismissable banner in web UI (#27479) 2023-10-20 04:08:13 +02:00
Renaud Chaput 5d9df170cf [Glitch] Do not display the navigation banner in the logo container 
Port 126cd7705d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-19 20:50:44 +02:00
Claire cc000c8859 Merge commit '126cd7705dbeca5712da941a72661e26c189658b' into glitch-soc/merge-upstream 2023-10-19 20:48:22 +02:00
Brian Campbell 1a3248dc90 [Glitch] Consider shown and pending status in explore prompt calculation 
Port f76e5111f0 to glitch-soc

Co-authored-by: Brian Campbell <brcampbell@beta.team>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-19 20:23:08 +02:00
Renaud Chaput 41f58e945c [Glitch] The `class` props should be `className` 
Port 10df97c542 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-19 20:23:08 +02:00
Renaud Chaput 1b70d7ed7c
Upgrade to react-router v5 (#25047) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-19 19:44:55 +02:00
Renaud Chaput 126cd7705d
Do not display the navigation banner in the logo container (#27476) 2023-10-19 19:36:08 +02:00
Claire 74fd46d3ab Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream 2023-10-19 19:14:04 +02:00
Jeong Arm 68401fc426 [Glitch] Support "in:public" search filter 
Port ad44d832b8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-19 18:56:18 +02:00
Matt Jankowski 9f218c9924
Refactor appeal partial to avoid brakeman XSS warning (#25880) 2023-10-19 17:25:54 +02:00
Matt Jankowski bcd0171e5e
Fix `Lint/UselessAssignment` cop (#27472) 2023-10-19 16:55:06 +02:00
github-actions[bot] 1ffd5a98a9
New Crowdin Translations (automated) (#27465) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-19 14:31:25 +02:00
Brian Campbell f76e5111f0
Consider shown and pending status in explore prompt calculation (#27466) 
Co-authored-by: Brian Campbell <brcampbell@beta.team>
 2023-10-19 14:25:57 +02:00
Renaud Chaput 10df97c542
The `class` props should be `className` (#27462) 2023-10-19 13:22:44 +02:00
Emelia Smith 7c3fea7275
Feature: Allow token introspection without read scope (#27142) 2023-10-18 14:10:07 +02:00
github-actions[bot] 4612576c68
New Crowdin Translations (automated) (#27454) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-18 11:08:10 +02:00
Matt Jankowski 63a2a4b074
Fix `Performance/DeletePrefix` cop (#27448) 2023-10-18 10:32:09 +02:00
Claire 63179f0bf4 Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream 2023-10-17 21:59:58 +02:00
Stanislas Signoud 8bbbd012d4 [Glitch] Fix missing redirections to make sure /home redirect to the advanced UI 
Port 935d54124e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-17 21:48:36 +02:00
Claire c10a667ac2 Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream 2023-10-17 21:42:49 +02:00
Claire b867d4581e Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream 
Conflicts:
- `spec/controllers/api/v1/timelines/tag_controller_spec.rb`:
  Glitch-soc had a few extra lines in this file to account for a different
  default setting. This file got replaced by
  `spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc
  additions were moved too.

Additional changes:
- `spec/requests/api/v1/statuses/sources_spec.rb`:
  Add glitch-soc-only attribute `content_type`.
 2023-10-17 21:35:07 +02:00
Claire 656a41db2a Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream has updated its README, we have a completely different one.
  Kept ours.
- `app/views/auth/sessions/two_factor.html.haml`:
  Upstream refactored stuff and the conflict is because of glitch-soc's theming
  system.
  Ported upstream changes while accounting for the different theming system.
 2023-10-17 20:59:18 +02:00
Jeong Arm ad44d832b8
Support "in:public" search filter (#26976) 2023-10-17 16:12:03 +02:00
Stanislas Signoud 935d54124e
Fix missing redirections to make sure /home redirect to the advanced UI (#27378) 2023-10-17 14:59:07 +02:00
Matt Jankowski 19900f647e
Add coverage for `UnreservedUsernameValidator` (#25590) 2023-10-17 13:05:28 +02:00
Matt Jankowski 33b073f77d
Extract partials from `admin/reports/show` view (#27427) 2023-10-16 18:07:17 +02:00
Matt Jankowski 8d0f12f776
Extract partials from `admin/accounts/show` view (#27428) 2023-10-16 18:02:15 +02:00
Matt Jankowski 08a376cbcb
Fix `Style/CombinableLoops` cop (#27429) 2023-10-16 16:36:28 +02:00
Matt Jankowski c91c0175db
Extract `card` partial from `disputes/strikes/show` view (#27426) 2023-10-16 16:04:29 +02:00