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

20609 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Claire
8d1900563d Fix missing workflow_dispatch trigger for build-security (#29041) 2024-02-08 20:58:31 -08:00
Claire
c23052e60d Adapt workflow to glitch-soc 2024-02-08 20:58:31 -08:00
Claire
faebb767e6 Add github action workflow for manual security builds (#29040) 2024-02-08 20:58:31 -08:00
Claire
2183099b75 Remove obsolete locale file (#2596) 2024-02-08 20:58:31 -08:00
Claire
a4e7cc2d94
Merge pull request #2590 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to bf153b384b
 2024-01-28 14:47:35 +01:00
Claire
bf153b384b Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
  Upstream refactored, changing lines textually close of glitch-soc-only lines
  pertaining to the theming system.
  Resolved the conflict.
- `app/controllers/auth/passwords_controller.rb`:
  Upstream refactored, changing lines textually close of glitch-soc-only lines
  pertaining to the theming system.
  Resolved the conflict.
- `app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb`:
  Upstream refactored, changing lines textually close of glitch-soc-only lines
  pertaining to the theming system.
  Resolved the conflict.
 2024-01-27 19:06:41 +01:00
Claire
420ca90071
Merge pull request #2585 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 3205a654ca
 2024-01-27 18:35:29 +01:00
Claire
dd7a66949a Fix CSS loading in redirect controller 2024-01-26 21:04:02 +01:00
Claire
54ece5040d [Glitch] Use active variants for boost icons and increase icon size 
Port 5a838ceaa9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-26 20:53:53 +01:00
Eugen Rochko
e5f50478b5 [Glitch] Add confirmation when redirecting logged-out requests to permalink 
Port SCSS changes from b19ae521b7 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-26 20:51:08 +01:00
Claire
5fa2821853 Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream 2024-01-26 20:47:20 +01:00
github-actions[bot]
ae9c675930
New Crowdin Translations (automated) (#2564) 
* 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-01-26 19:45:04 +01:00
Claire
108fb33478
Merge pull request #2584 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 7a1f087659
 2024-01-26 18:47:09 +01:00
Claire
70de52c297 Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream 2024-01-25 19:51:19 +01:00
Claire
adde803656
Merge pull request #2583 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 01ce9df880
 2024-01-25 19:50:12 +01:00
Matt Jankowski
42ab855b23
Add specs for Instance model scopes and add with_domain_follows scope (#28767) 2024-01-25 15:28:27 +00:00
Matt Jankowski
4cdf62e576
Extract rebuild_index method in maintenance CLI (#28911) 2024-01-25 15:26:51 +00:00
Matt Jankowski
0b38946c87
Update paperclip and climate_control gems (#28379) 2024-01-25 15:18:15 +00:00
Matt Jankowski
17ea22671d
Fix Style/GuardClause cop in app/controllers (#28420) 2024-01-25 15:13:41 +00:00