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

21689 commits

This branch
This branch
All branches
Author SHA1 Message Date
丈槍由紀
7e27d1f4a1 Fix formatting of the filtering settings 2024-02-17 11:02:07 -05:00
丈槍由紀
a80c058616 Add Reject Pattern to Other Page on GlitchSoc 2024-02-17 09:57:05 -05:00
noellabo
4e2c0a03da Add reject pattern to Admin setting (Ported to Glitch Soc) 
# Conflicts:
#	app/views/admin/settings/shared/_links.html.haml
#	config/routes/admin.rb
 2024-02-17 09:56:24 -05:00
James Moy
6a19fb9b41
Merge branch 'neatchee:main' into newmain-tmp3 2024-02-16 21:22:43 -05:00
neatchee
2ce08556e5 Merge remote-tracking branch 'glitch-soc/main' into merge/glitch/20240216 2024-02-16 10:32:11 -08:00
Claire
c0279385d7
Adopt upstream's design for account profiles (#2622) 
* Mostly adopt upstream's design for account profiles

* Reduce some margins
 2024-02-16 17:57:43 +01:00
Claire
d7d477047e Bump version to v4.3.0-alpha.3 (#29241) 2024-02-16 12:17:15 +01:00
Claire
6c1b6194f7 Merge pull request from GHSA-jhrq-qvrm-qr36 
* Fix insufficient Content-Type checking of fetched ActivityStreams objects

* Allow JSON-LD documents with multiple profiles
 2024-02-16 12:17:15 +01:00
renovate[bot]
63080e10a9 Update dependency pg to v1.5.5 (#29230) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-16 10:06:25 +01:00
Claire
e7ca82762d Fix user creation failure handling in OAuth paths (#29207) 2024-02-14 23:12:59 +01:00
千代田桃
3e4f520c06 Merge branch 'main' of https://github.com/neatchee/mastodon into newmain-tmp3 2024-02-14 12:08:25 -05:00
neatchee
f70e4012b4 Merge remote-tracking branch 'glitch-soc/main' 2024-02-14 08:11:58 -08:00
千代田桃
0c34280309 Merge branch 'main' of https://github.com/neatchee/mastodon into newmain-tmp3 
# Conflicts:
#	app/javascript/flavours/glitch/styles/components/announcements.scss
#	config/initializers/content_security_policy.rb
 2024-02-14 10:38:55 -05:00
Claire
486e4bc7d3 Fix OmniAuth tests (#29201) 2024-02-14 16:07:28 +01:00
Claire
40439399c6 Bump version to v4.3.0-alpha.2 (#29200) 2024-02-14 15:26:18 +01:00
Claire
53b73ed6a2 Merge pull request from GHSA-vm39-j3vx-pch3 
* Prevent different identities from a same SSO provider from accessing a same account

* Lock auth provider changes behind `ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH=true`

* Rename methods to avoid confusion between OAuth and OmniAuth
 2024-02-14 15:25:15 +01:00
Emelia Smith
436419cc2f Merge pull request from GHSA-7w3c-p9j8-mq3x 
* Ensure destruction of OAuth Applications notifies streaming

Due to doorkeeper using a dependent: delete_all relationship, the destroy of an OAuth Application bypassed the existing AccessTokenExtension callbacks for announcing destructing of access tokens.

* Ensure password resets revoke access to Streaming API

* Improve performance of deleting OAuth tokens

---------

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-14 15:25:15 +01:00
Claire
3c3ef8b9d3 Add sidekiq_unique_jobs:delete_all_locks task and disable sidekiq-unique-jobs UI by default (#29199) 2024-02-14 13:42:15 +01:00
neatchee
b515616120 Merge remote-tracking branch 'TheEssem/feature/emoji-reactions' 
Conflicts resolved:
	app/models/status.rb
	app/serializers/rest/status_serializer.rb
 2024-02-14 00:08:23 -08:00
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
Essem
db9dbb302f
Hydrate reactions on streaming API 2024-02-13 20:43:13 -06:00
Essem
11bb126009
Purge status reactions on account delete 2024-02-13 20:43:13 -06:00
Essem
3e2c125e8f
Fix rubocop lint issue 2024-02-13 20:43:13 -06:00
Essem
07e7552eba
Refactor status reactions query 
This was done to announcement reactions in 1b0cb3b54d. Might as well do it here too.
 2024-02-13 20:43:13 -06:00
Essem
4dab0c31de
Simplify reactions API controller 2024-02-13 20:43:12 -06:00
Essem
9f546eca7c
Update reaction emails 
Reaction icon made by t3rminus@calamity.world
 2024-02-13 20:43:12 -06:00
Essem
eaafd70233
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-13 20:43:12 -06:00
Essem
9bb4e5da79
Move reaction normalization to API controller 2024-02-13 20:43:12 -06:00
Essem
77196a3be8
Quick fixes 2024-02-13 20:43:12 -06:00
Essem
55321f8b2c
Make name of like content parser function more general 2024-02-13 20:43:12 -06:00
Essem
37a3f521bc
Normalize emojis with variant selectors 2024-02-13 20:43:12 -06:00
Essem
e087e0f75b
Check for content attribute in Misskey likes 2024-02-13 20:43:11 -06:00
Essem
40585aadb1
Fix rubocop complaint 2024-02-13 20:43:11 -06:00
Essem
043078f0e8
Add reaction notification column settings 
This was in a previous PR. Not quite sure how it didn't carry over.
 2024-02-13 20:43:11 -06:00
Essem
a60952f109
More cleanup 2024-02-13 20:43:11 -06:00
Essem
4db4348afe
Linting fixes 2024-02-13 20:43:11 -06:00
Essem
06284dfe13
Refactor react services 2024-02-13 20:43:11 -06:00
Essem
bb82afaeb3
Fix reblog reactions 2024-02-13 20:43:11 -06:00
Essem
22d97ac160
Add notification emails for reactions 2024-02-13 20:43:10 -06:00
Essem
dff64aaad7
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-13 20:43:10 -06: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