mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2025-01-19 00:24:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
21573 commits 5 branches 150 tags 287 MiB
Commit graph

21573 commits

This branch
This branch
All branches
Author SHA1 Message Date
neatchee
2343a1f452 Merge remote-tracking branch 'glitch-soc/main' into merge/glitch/20240213 
Conflicts resolved:
	app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx
	app/javascript/flavours/glitch/styles/components/accounts.scss
	app/javascript/flavours/glitch/styles/components/announcements.scss
	app/javascript/flavours/glitch/styles/components/columns.scss
	app/javascript/flavours/glitch/styles/components/status.scss
	app/serializers/initial_state_serializer.rb
 2024-02-13 23:29:54 -08:00
Emelia Smith
eae436c5a8 Disable administrative doorkeeper routes (#29187) 2024-02-13 20:03:00 +01:00
Emelia Smith
b83076647e Ignore legacy moderator and admin columns on User model (#29188) 2024-02-13 20:03:00 +01:00
renovate[bot]
7100106f3f Update dependency sidekiq-unique-jobs to v7.1.33 (#29175) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-13 20:03:00 +01:00
renovate[bot]
04da8f887b Update dependency pghero to v3.4.1 (#29144) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-13 20:03:00 +01:00
renovate[bot]
d9d0a6ef33 Update dependency irb to v1.11.2 (#29135) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-13 20:03:00 +01:00
renovate[bot]
93b365bfc0 Update dependency webmock to v3.20.0 (#29120) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-13 20:03:00 +01:00
Claire
e3c4e90646
Fix new list button being blank (#2616) 2024-02-13 12:48:01 +01:00
Claire
084d051e6c
Merge pull request #2608 from ClearlyClaire/glitch-soc/refactor/monolithic-components-css 
Merge SCSS in a single `components.scss` file
 2024-02-12 22:18:55 +01:00
Claire
c249c10f74 Fix account suggestion size inconsistency with upstream 2024-02-11 21:55:36 +01:00
neatchee
16efde108c Merge branch 'temp/target2' 2024-02-08 21:11:58 -08:00
Essem
5252802786 Purge status reactions on account delete 2024-02-08 21:05:39 -08:00
Essem
60a49ad290 Fix rubocop lint issue 2024-02-08 21:05:39 -08:00
Essem
168e783c7b Refactor status reactions query 
This was done to announcement reactions in 1b0cb3b54d. Might as well do it here too.
 2024-02-08 21:05:39 -08:00
Essem
cddea4c9b2 Simplify reactions API controller 2024-02-08 21:05:39 -08:00
Essem
a7e693adfd Update reaction emails 
Reaction icon made by t3rminus@calamity.world
 2024-02-08 21:05:39 -08:00
Essem
0091fcf047 Revert variant selector normalization 
Probably worth tackling later, but for now it's not worth worrying about; some other implementations (e.g. Misskey's) look to have the same behavior anyways.
 2024-02-08 21:05:39 -08:00
Essem
3725787e13 Move reaction normalization to API controller 2024-02-08 21:05:39 -08:00
Essem
6a7f9bcc37 Quick fixes 2024-02-08 21:05:39 -08:00
Essem
e897e936e4 Make name of like content parser function more general 2024-02-08 21:05:39 -08:00
Essem
36b9debba8 Normalize emojis with variant selectors 2024-02-08 21:05:39 -08:00
Essem
5ecb76e93d Check for content attribute in Misskey likes 2024-02-08 21:05:39 -08:00
Essem
e4b02ff510 Fix rubocop complaint 2024-02-08 21:05:39 -08:00
Essem
13185f8fc2 Add reaction notification column settings 
This was in a previous PR. Not quite sure how it didn't carry over.
 2024-02-08 21:05:39 -08:00
Essem
c8ecaf89ef More cleanup 2024-02-08 21:05:39 -08:00
Essem
89e637896b Linting fixes 2024-02-08 21:05:39 -08:00
Essem
1a1bcb5f80 Refactor react services 2024-02-08 21:05:39 -08:00
Essem
03d81b7430 Fix reblog reactions 2024-02-08 21:05:39 -08:00
Essem
b69e91ea88 Add notification emails for reactions 2024-02-08 21:05:39 -08:00
Essem
01b4d47924 Add support for emoji reactions 
Squashed, modified, and rebased from glitch-soc/mastodon#2221.

Co-authored-by: fef <owo@fef.moe>
Co-authored-by: Jeremy Kescher <jeremy@kescher.at>
Co-authored-by: neatchee <neatchee@gmail.com>
Co-authored-by: Ivan Rodriguez <104603218+IRod22@users.noreply.github.com>
Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2024-02-08 21:05:39 -08:00
Eugen Rochko
eb8d7af684 Fix confirmation e-mails when signing up through an app (#29064) 2024-02-08 20:58:31 -08:00
Claire
a598cc92fa Fix self-destruct schedule not actually replacing initial schedule (#29049) 2024-02-08 20:58:31 -08:00
renovate[bot]
4b1bc09f3a Update dependency brakeman to v6.1.2 (#29062) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-08 20:58:31 -08:00
renovate[bot]
bd18a1ca5d Update dependency bootsnap to '~> 1.18.0' (#29019) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-08 20:58:31 -08:00
renovate[bot]
19e1620676 Update dependency tzinfo-data to v1.2024.1 (#29052) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-08 20:58:31 -08:00
Matt Jankowski
cc150165cd Update nsa gem to version 0.3.0 (#29065) 2024-02-08 20:58:31 -08:00
renovate[bot]
b9775b71b0 Update dependency haml_lint to v0.56.0 (#29082) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-08 20:58:31 -08:00
renovate[bot]
8dc18c8223 Update dependency nokogiri to v1.16.2 [SECURITY] (#29106) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-08 20:58:31 -08:00
renovate[bot]
2093c6917c Update dependency capybara to v3.40.0 (#28966) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-08 20:58:31 -08:00
renovate[bot]
9e4cd26190 Update dependency chewy to v7.5.1 (#29018) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-08 20:58:31 -08:00
github-actions[bot]
f737ed2728 New Crowdin Translations (automated) (#2588) 
* New Crowdin translations

* Fix bogus translation files

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-08 20:58:31 -08:00
JS Moore
0d95c15be7 Add env variable support for number of followable hashtags in feed column (#2500) 
* Add env variable support for number of followable hashtags in feed column.

* Add a note about performance concerns for higher values.

See discussion in https://github.com/glitch-soc/mastodon/pull/2500

* Update .devcontainer/docker-compose.yml

---------

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-08 20:58:31 -08:00
Essem
7c4777579a Fix doodle modal icons (#2597) 2024-02-08 20:58:31 -08:00
Claire
23183832a4 Fix build-security docker tags 2024-02-08 20:58:31 -08:00
Claire
3b0c90ae9a Temporary hack to correctly tag the security docker image… 2024-02-08 20:58:31 -08:00
Aaron Brady
2a7a550789 Restore -streaming suffix for security builds (#2602) 2024-02-08 20:58:31 -08:00
Claire
1af5c4030e Fix build-security workflow for glitch-soc 2024-02-08 20:58:31 -08:00
Claire
1663c98c66 Merge pull request from GHSA-3fjr-858r-92rw 
* Fix insufficient origin validation

* Bump version to 4.3.0-alpha.1
 2024-02-08 20:58:31 -08:00
Claire
e33a36dac6 Fix security builds not being marked latest 2024-02-08 20:58:31 -08:00
Matt Jankowski
34b69f6fc6 Configure selenium to use Chrome version 120 (#29038) 2024-02-08 20:58:31 -08:00