treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
18,602 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

18602 Commits (0cf9fcd5e9f197607fd4dfe5ded57ff8248716ff)

Author SHA1 Message Date
dependabot[bot] 210edaea50 Bump @types/lodash from 4.14.194 to 4.14.195 (#25184) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-30 09:33:21 +02:00
dependabot[bot] ad10c6da53 Bump sidekiq from 6.5.8 to 6.5.9 (#25176) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-30 09:29:40 +02:00
dependabot[bot] 2b709d80a3 Bump postcss from 8.4.23 to 8.4.24 (#25169) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-30 09:28:39 +02:00
S.H f145662c05 Align argument type to keyword argument for private process method in FetchResourceService (#25189) 2023-05-30 09:28:01 +02:00
Daniel M Brasil ad3f504a21 Add test coverage for `Mastodon::CLI::Accounts#modify` (#25145) 2023-05-29 15:31:59 +02:00
y.takahashi 5c744a5d7d Handle Surrogate Pairs in truncate() (#25148) 2023-05-29 11:55:16 +02:00
Daniel M Brasil dd0d755824 Add test coverage for `Mastodon::CLI::Accounts#create` (#25143) 2023-05-29 11:43:19 +02:00
Claire 615a7d5795 Fix extraneous newlines 2023-05-28 18:06:09 +02:00
fusagiko / takayamaki 62f386d44e [Glitch] Rewrite actions/modal and reducers/modal with typescript 
Port a19c1671af to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-28 17:49:55 +02:00
たいち ひ cd0ff98425 [Glitch] Fix export style of `<LoadGap />` based on `<Domain />` 
Port ae0341c203 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-28 17:15:21 +02:00
Renaud Chaput f58504f2c7 [Glitch] Update inconsistent `defaultMessage` 
Port 169f141c4c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-28 17:14:31 +02:00
Claire 53b8a15ee9 Merge branch 'main' into glitch-soc/merge-upstream 2023-05-28 17:01:25 +02:00
Eugen Rochko 2592015ce6 [Glitch] Change share action from being in action bar to being in dropdown in web UI 
Port 97235baa4f to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-28 16:59:12 +02:00
Renaud Chaput b17b1827e7 [Glitch] Fix `null` signUp URL handling from #25014 
Port 9be9f4f5e2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-28 16:52:16 +02:00
たいち ひ 8134d62112 [Glitch] Rewrite `<LoadGap />` as FC and TS 
Port 6077f3e24c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-28 16:48:17 +02:00
Claire 973743ff50 Merge commit 'b6c687abc288b3ea7fe16bf38912462c2ca1b4e4' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  We removed it from glitch-soc.
  Keep it deleted.
 2023-05-28 16:41:14 +02:00
Claire a7e6f3df20 Fix import order with ESLint 
Port 7b5a274836 to glitch-soc
 2023-05-28 16:38:10 +02:00
Claire fa16de4a4e Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' into glitch-soc/merge-upstream 
Conflicts:
- `.eslintrc.js`:
  Upstream moved a configuration block in which we had added a glitch-only
  path.
  Moved the configuration block as upstream did.
- other files:
  Upstream reordered imports, and those files had different ones.
  Kept our version and reordered imports using the same rules.
 2023-05-28 15:54:31 +02:00
Claire 214f04f04b [Glitch] Add support for custom sign-up URLs 
Port 4d631fcfb7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-28 15:09:28 +02:00
Claire ffc7a57f8b [Glitch] Fix video player offering to expand in a lightbox when it's in an iframe 
Port cbcf32777e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-28 15:06:29 +02:00
Claire 006bc485e4 Merge commit '3e747f08639a78ac86858f6a2d2fc08a05ff3365' into glitch-soc/merge-upstream 2023-05-28 15:01:53 +02:00
Claire 8793625bf3 [Glitch] Use JSX syntax for Fragments 
Port abbc6dfcba to glitch-soc
 2023-05-28 14:56:24 +02:00
Claire 31c4b3183b Merge commit 'abbc6dfcbaa105faee402694061c408d37320b75' into glitch-soc/merge-upstream 2023-05-28 14:32:26 +02:00
Claire fb2bf621eb [Glitch] Use the new JSX transform everywhere 
Port 3b0c3e94e0 to glitch-soc
 2023-05-28 14:18:43 +02:00
Claire 03a3ff1f02 Merge commit '3b0c3e94e0831edcf4298bf9940799a2e94c5583' into glitch-soc/merge-upstream 2023-05-28 13:55:30 +02:00
Claire 4306b15181 Merge pull request #2236 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to adaa7a61e9
 2023-05-27 11:28:10 +02:00
Claire 20e8b117e3 fixup! [Glitch] Upgrade to React 18 2023-05-26 18:44:18 +02:00
Matt Jankowski 95b54f5ad7 Extract methods for user de-duping in maintenance CLI (#25117) 2023-05-26 09:42:16 +02:00
Matt Jankowski 1411f75aae Fix RSpec/NoExpectationExample cop (#25103) 2023-05-26 09:41:12 +02:00
Claire ab642ee227 Fix glitch-soc-only tests being broken because of test refactor 2023-05-26 00:10:57 +02:00
たいち ひ 114ad2d4d1 [Glitch] Rewrite `<TimelineHint />` as FC and TS 
Port 9cfab99590 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 23:58:54 +02:00
たいち ひ 76e9386332 [Glitch] Rewrite `<Skeleton/>` as FC and TS 
Port 0b87919abf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 23:55:36 +02:00
Claire 758a0ae1e9 [Glitch] Allow scripts in post embed previews 
Port 18361ae0c5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 23:52:04 +02:00
Claire 569302e5ce Merge commit 'adaa7a61e9c87859251f4ac9be387d3d24c0a962' into glitch-soc/merge-upstream 2023-05-25 23:47:28 +02:00
Renaud Chaput 056dd39631 [Glitch] Upgrade to React 18 
Port ab029328cf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 23:45:01 +02:00
Claire 3413fc7002 Merge commit 'ab029328cf94940dce7ed26d005af3d96a857a59' into glitch-soc/merge-upstream 2023-05-25 23:18:57 +02:00
Claire ee6f9d2c92 Merge commit 'cc5d2e22dd4b7afb9035cf999979e3cd36d97e46' into glitch-soc/merge-upstream 2023-05-25 22:59:30 +02:00
Claire 9e224add8a Merge commit '844d8e101e84cc1c27c99005b7059a975ac826ca' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
  Upstream merged our captcha code, but there are some
  conflicts due to glitch-soc's theming system.
- `app/views/admin/settings/registrations/show.html.haml`:
  Upstream merged our captcha code, but there are some
  conflicts due to glitch-soc's theming system.

Additional changes:
- `Gemfile`:
  Upstream added hcaptcha dependency in another place in the file.
- `config/settings.yml`:
  Upstream added the `captcha_enabled` setting in another place in the file.
 2023-05-25 22:49:18 +02:00
Claire b55d56387b [Glitch] Add polling and automatic redirection to `/start` on email confirmation 
Port 86961b5b7b to glitch-soc
 2023-05-25 22:37:14 +02:00
Claire 560f605dc2 Merge commit '86961b5b7b459fd778a9b697bbdfbda03512babb' into glitch-soc/merge-upstream 2023-05-25 22:18:55 +02:00
Claire c3cca0eff4 [Glitch] Fix being unable to load past a full page of filtered posts in Home timeline 
Port d2eef78d1c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 22:00:07 +02:00
Christian Schmidt 6cde4718c0 [Glitch] Fix UI crash in moderation interface when opening the media modal 
Port 778fd4d29b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 21:57:19 +02:00
Eugen Rochko 12c177a34e [Glitch] Change "Sign in" to "Login" 
Port d05ff56746 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 21:52:37 +02:00
Claire 0042d5a246 [Glitch] Fix videos being improperly positioned on safari 
Port de95d0ca8f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 21:47:48 +02:00
Renaud Chaput e11d884c53 [Glitch] Add stricter ESLint rules for Typescript files 
Port 6a3211876c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 21:43:19 +02:00
Nick Schonning dc9dcd0fa9 [Glitch] Enable ESLint react/no-deprecated 
Port b0dd260a7a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 21:07:38 +02:00
Renaud Chaput afde99dc29 [Glitch] Disable RTK safety middlewares 
Port c9dfc55b22 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 20:57:42 +02:00
fusagiko / takayamaki a3c2519ba0 [Glitch] Add type annotation for DisplayName component 
Port a150bb4f2e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 20:57:07 +02:00
fusagiko / takayamaki b3e018ce58 [Glitch] Rename Image component to ServerHeroImage 
Port cbca954632 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 20:44:09 +02:00
Claire 11368da545 Merge commit 'afb74b97b237a32c5e1db2a6a9968d587a3d5dd3' into glitch-soc/merge-upstream 
Conflicts:
- `config/webpack/generateLocalePacks.js`:
  A dependency update changed how functions are imported.
  Also, some linting fixes not applicable to glitch-soc.
 2023-05-25 20:43:25 +02:00