fef
/
nyastodon
forked from mirrors/catstodon
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,673 Commits
2 Branches
270 Tags
270 MiB
develop
main
nya-1.2.2
nya-1.2.1
nya-1.2.0
v0.1.2
v0.1.1
v0.1.0
4.0.1+1.0.0
4.0.1+1.0.1
4.0.1+1.0.2
4.0.1+1.0.3
4.0.1+1.0.4
v0.6
v0.7
v0.8
v0.9
v0.9.9
v1.0
v1.1
v1.1.1
v1.1.2
v1.2
v1.2.1
v1.2.2
v1.3
v1.3.1
v1.3.2
v1.4.1
v1.4.2
v1.4.3
v1.4.4
v1.4.5
v1.4.6
v1.4.7
v1.4rc1
v1.4rc2
v1.4rc3
v1.4rc4
v1.4rc5
v1.4rc6
v1.5.0
v1.5.0rc1
v1.5.0rc2
v1.5.0rc3
v1.5.1
v1.6.0
v1.6.0rc1
v1.6.0rc2
v1.6.0rc3
v1.6.0rc4
v1.6.0rc5
v1.6.1
v2.0.0
v2.0.0rc1
v2.0.0rc2
v2.0.0rc3
v2.0.0rc4
v2.1.0
v2.1.0rc1
v2.1.0rc2
v2.1.0rc3
v2.1.0rc4
v2.1.0rc5
v2.1.0rc6
v2.1.1
v2.1.2
v2.1.3
v2.2.0
v2.2.0rc1
v2.2.0rc2
v2.3.0
v2.3.0rc1
v2.3.0rc2
v2.3.0rc3
v2.3.1
v2.3.1rc1
v2.3.1rc2
v2.3.1rc3
v2.3.2
v2.3.2rc1
v2.3.2rc2
v2.3.2rc3
v2.3.2rc4
v2.3.2rc5
v2.4.0
v2.4.0rc1
v2.4.0rc2
v2.4.0rc3
v2.4.0rc4
v2.4.0rc5
v2.4.1
v2.4.1rc1
v2.4.1rc2
v2.4.1rc3
v2.4.1rc4
v2.4.2
v2.4.2rc1
v2.4.2rc2
v2.4.2rc3
v2.4.3
v2.4.3rc1
v2.4.3rc2
v2.4.3rc3
v2.4.4
v2.4.5
v2.5.0
v2.5.0rc1
v2.5.0rc2
v2.5.1
v2.5.2
v2.6.0
v2.6.0rc1
v2.6.0rc2
v2.6.0rc3
v2.6.0rc4
v2.6.1
v2.6.2
v2.6.3
v2.6.4
v2.6.5
v2.7.0
v2.7.0rc1
v2.7.0rc2
v2.7.0rc3
v2.7.1
v2.7.2
v2.7.3
v2.7.4
v2.8.0
v2.8.0rc1
v2.8.0rc2
v2.8.0rc3
v2.8.1
v2.8.2
v2.8.3
v2.8.4
v2.9.0
v2.9.0rc1
v2.9.0rc2
v2.9.1
v2.9.2
v2.9.3
v2.9.4
v3.0.0
v3.0.0rc1
v3.0.0rc2
v3.0.0rc3
v3.0.1
v3.0.2
v3.1.0
v3.1.0rc1
v3.1.0rc2
v3.1.1
v3.1.2
v3.1.3
v3.1.4
v3.1.5
v3.2.0
v3.2.0rc1
v3.2.0rc2
v3.2.1
v3.2.2
v3.3.0
v3.3.0rc1
v3.3.0rc2
v3.3.0rc3
v3.3.1
v3.3.2
v3.3.3
v3.4.0
v3.4.0rc1
v3.4.0rc2
v3.4.1
v3.4.2
v3.4.3
v3.4.4
v3.4.5
v3.4.6
v3.4.7
v3.4.8
v3.5.0
v3.5.0rc1
v3.5.0rc2
v3.5.0rc3
v3.5.1
v3.5.2
v3.5.3
v3.5.3+1.0.0
v3.5.3+1.0.1
v3.5.3+1.0.3
v3.5.3+1.0.4
v3.5.3+1.0.5
v3.5.3+1.0.6
v3.5.3+1.0.7
v3.5.3+1.0.8
v3.5.3+1.0.9
v3.5.3+1.1.0
v3.5.3+1.1.1
v3.5.3+1.1.2
v3.5.3+1.1.3
v3.5.3+1.1.4
v3.5.3+1.1.5
v3.5.3+1.1.6
v3.5.3+1.2.1
v3.5.3+1.2.2
v3.5.3+1.2.3
v4.0.0
v4.0.0+1.0.0
v4.0.0rc1
v4.0.0rc2
v4.0.0rc3
v4.0.0rc4
v4.0.1
v4.0.2
v4.0.2+1.0.0
v4.0.2+1.0.1
v4.0.2+1.0.10
v4.0.2+1.0.11
v4.0.2+1.0.12
v4.0.2+1.0.13
v4.0.2+1.0.2
v4.0.2+1.0.3
v4.0.2+1.0.4
v4.0.2+1.0.5
v4.0.2+1.0.6
v4.0.2+1.0.7
v4.0.2+1.0.8
v4.0.2+1.0.9
v4.0.2+1.1.0
v4.0.2+1.1.1
v4.0.2+1.1.2
v4.0.2+1.1.3
v4.0.2+1.1.4
v4.0.2+1.1.5
v4.0.2+1.1.6
v4.0.2+1.1.7
v4.0.2+1.1.8
v4.0.2+1.1.9
v4.1.0
v4.1.0+1.0.0
v4.1.0+1.0.1
v4.1.0+2.0.0
v4.1.0+2.0.1
v4.1.0+2.0.2
v4.1.0+2.0.4
v4.1.0+2.0.5
v4.1.0+2.1.0
v4.1.0+2.1.1
v4.1.0rc1
v4.1.0rc2
v4.1.0rc3
v4.1.1+1.0.0
v4.1.1+1.0.1
v4.1.1+1.0.2
v4.1.1+1.0.3
v4.1.1+1.0.4
v4.1.1+1.0.5
v4.1.1+1.0.6
v4.1.1+1.0.7
v4.1.2+1.0.0
v4.1.2+1.0.1
v4.1.2+1.0.2
v4.1.2+1.0.3
v4.1.2+1.0.4
v4.1.2+1.1.0
v4.1.2+1.1.1
v4.1.2+1.1.2
v4.1.2+1.1.3
v4.1.2+1.1.4
v4.1.3+1.0.0
v4.1.4+1.0.0
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '6a251a7dd8'
${ noResults }
Commit Graph

894 Commits (6a251a7dd845a0363f690ae3bc7118b01d009985)

Author SHA1 Message Date
anna 8380f9fc2c
merge catstodon/main into main 2 years ago
Jeremy Kescher 41ce71cc92
Merge remote-tracking branch 'upstream/main' into develop 2 years ago
anna 1b7839f00a
merge catcatnya/main into main 2 years ago
anna 1792b688ac
bump to nyastodon 1.0.3 2 years ago
Jeremy Kescher 1381fb355c
v4.0.2+1.0.2 2 years ago
anna 9d14085607
bump to nyastodon 1.0.2 2 years ago
anna 44689beb43
merge catcatnya/main into main 2 years ago
Jeremy Kescher 874d4a2585
v4.0.2+1.0.1 2 years ago
anna 7c7f2d1b91
merge catcatnya/main into main 2 years ago
Jeremy Kescher 82e063ac6c
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	.github/workflows/build-image.yml
 2 years ago
Claire 1901829f9a Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Our config file is pretty different from upstream.
  Upstream changed CSP directive `script-src` to include
  `wasm-unsafe-eval` instead of `unsafe-eval`, which we
  did not include.
  Added `wasm-unsafe-eval` to `script-src` to fix
  execution of the OCR web worker.
- `package.json`:
  Upstream updated a dependency (`array-includes`) textually
  adjacent to a glitch-soc-only dependency (`atrament`).
  Updated `array-includes` as upstream did.
 2 years ago
anna baab85fac7
add post suffix version 2 years ago
Jeremy Kescher 6d5a8d89d1
4.0.1+1.0.4 2 years ago
Eugen Rochko 03b0f3ac83
Bump version to 4.0.2 (#20725) 2 years ago
Jeremy Kescher 4b56353f13
Merge remote-tracking branch 'upstream/main' into develop 2 years ago
Jeremy Kescher 0005e01aa6
4.0.1+1.0.2 2 years ago
Jeremy Kescher 14ef153c69
Revert "[Glitch] Fix nodes order being sometimes mangled when rewriting emoji" 
This reverts commit 06faf2f977.
 2 years ago
Jeremy Kescher 06faf2f977
[Glitch] Fix nodes order being sometimes mangled when rewriting emoji 
backport ccbca50a25 by Claire
 2 years ago
Jeremy Kescher ec15e58efa
4.0.1+1.0.0 2 years ago
Claire b5698af25f Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
Eugen Rochko 4415dd6036
Bump version to 4.0.1 (#20696) 2 years ago
Jeremy Kescher 122870cb6b
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	config/initializers/rack_attack.rb
#	lib/mastodon/version.rb
 2 years ago
Eugen Rochko fb389bd73c
Bump version to 4.0.0 (#20636) 2 years ago
Claire cd713cac81 Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
Eugen Rochko 75299a042c
Bump version to 4.0.0rc4 (#20634) 2 years ago
Claire 32c70d2f09 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/announcements/edit.html.haml`:
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
- `app/views/admin/announcements/new.html.haml`
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
 2 years ago
Claire 457c37e47a
Fix index name in fix-duplicates task (#20632) 2 years ago
Eugen Rochko b31afc6294
Fix error when passing unknown filter param in REST API (#20626) 
Fix #19156
 2 years ago
Claire bd806a3090
Update fix-duplicates (#20502) 
Fixes #19133
 2 years ago
Arthur Isac 1af482659d
Copied Spaces support from packer .rake (#20573) 2 years ago
Jeremy Kescher c40b063bd4
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	.github/workflows/build-image.yml
#	lib/mastodon/version.rb
 2 years ago
Claire 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/account.rb`:
  Conflict because we (glitch-soc) have disabled trending of posts without
  review.
  Discarded that upstream change.
- `app/views/admin/settings/discovery/show.html.haml`:
  Just an extra setting in glitch-soc.
  Kept that extra setting.
 2 years ago
Jeremy Kescher 1f2f01370b
blurhash_transcoder: prevent out-of-bound reads with <8bpp images 
Backport from vanilla: 36bc90e8aa

The Blurhash library used by Mastodon requires an input encoded as 24
bits raw RGB data. The conversion to raw RGB using Imagemagick did not
previously specify the desired bit depth. In some situations, this leads
Imagemagick to output in a pixel format using less bpp than expected.
This then manifested as segfaults of the Sidekiq process due to
out-of-bounds read, or potentially a (highly noisy) memory infoleak.
 2 years ago
Eugen Rochko 53028af10e
Bump version to 4.0.0rc3 (#20378) 2 years ago
Pierre Bourdon 36bc90e8aa
blurhash_transcoder: prevent out-of-bound reads with <8bpp images (#20388) 
The Blurhash library used by Mastodon requires an input encoded as 24
bits raw RGB data. The conversion to raw RGB using Imagemagick did not
previously specify the desired bit depth. In some situations, this leads
Imagemagick to output in a pixel format using less bpp than expected.
This then manifested as segfaults of the Sidekiq process due to
out-of-bounds read, or potentially a (highly noisy) memory infoleak.

Fixes #19235.
 2 years ago
Yamagishi Kazutoshi 19a8563905
Fix `ENV` (#20377) 2 years ago
Jeremy Kescher 1eadfddbd2
Bump to v3.5.3+1.2.2 2 years ago
F 9feba112a7
Make enable_starttls configurable by envvars (#20321) 
ENABLE_STARTTLS is designed to replace ENABLE_STARTTLS_AUTO by accepting
three values: 'auto' (the default), 'always', and 'never'. If
ENABLE_STARTTLS isn't provided, we fall back to ENABLE_STARTTLS_AUTO. In
this way, this change should be fully backwards compatible.

Resolves #20311
 2 years ago
Jeremy Kescher 5ee53d06a2
Bump to v3.5.3+1.2.1 2 years ago
Jeremy Kescher cf746c6ded
Bump to v3.5.3+1.2.0 2 years ago
Jeremy Kescher 03f50f2f00
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	app/javascript/flavours/glitch/features/ui/components/link_footer.js
#	lib/mastodon/version.rb
#	public/avatars/original/missing.png
 2 years ago
Jeremy Kescher 996267fc8b
Fix vanilla flavor being broken due to incorrect imports 2 years ago
Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.
 2 years ago
Eugen Rochko 5187e4e758
Bump version to 4.0.0rc2 (#19831) 2 years ago
Jeremy Kescher e326d44f29
Add missing require_auth? in StatusController 2 years ago
Jeremy Kescher 52f9449b3d
Update outdated link to source 2 years ago
Jeremy Kescher 9dafedaecd
Remove misc duplicate declarations 2 years ago
Jeremy Kescher f0422fb416
v3.5.3+1.1.3 2 years ago
Eugen Rochko e02812d5b6
Add assets from Twemoji 14.0 (#19733) 2 years ago
Claire 1dca08b76f
Fix admin action logs page (#19649) 
* Add tests

* Fix crash when trying to display orphaned action logs

* Add migration for older admin action logs
 2 years ago