catstodon

CatCatNya/catstodon

Fork 0

forked from glitch-soc-github-mirror/mastodon

Commit graph

e4949a252e

run i18n-tasks normalize fef 2022-12-03 14:23:55 +00:00
f0197c80dc

display external custom emoji reactions properly fef 2022-12-03 11:57:00 +00:00
7175d10935

handle incoming custom emoji reactions properly fef 2022-12-03 10:22:15 +00:00
6d51a3de13

support Undo action for EmojiReaction fef 2022-12-03 08:24:23 +00:00
bd026ad118

download remote custom emojis from reactions fef 2022-12-02 17:02:06 +00:00
17d23d1c73

fix integer cast bug fef 2022-12-02 10:17:59 +00:00
77491a8f22

sanitize setting for number of visible reactions fef 2022-12-02 09:37:56 +00:00
e3f76a1cb0

Add reaction limit to instance serializer Jeremy Kescher 2022-12-02 08:05:10 +01:00
65d727a9e6

fix padding on posts without reactions fef 2022-12-02 01:52:59 +00:00
a2db70b3c8

rename nop handler to handleNoOp fef 2022-12-02 01:00:08 +00:00
a9bb743db7

cleanup JS imports and other minor stuff fef 2022-12-01 23:30:39 +01:00
04467e8f6d

remove unnecessary parameter fef 2022-12-01 04:26:13 +00:00
a0d7cadcfd

change reaction api to match other interactions fef 2022-12-01 02:24:08 +00:00
f4faa1b511

fix reaction deletion bug and clean up controller fef 2022-12-01 01:41:47 +00:00
f580ffb127

remove outdated comments fef 2022-11-30 19:29:56 +00:00
e405eb76f4

clean up new imports in vanilla flavour fef 2022-11-30 17:09:16 +00:00
7cbe6dc3e8

rebase with upstream fef 2022-11-30 17:25:36 +01:00
7250a4f6c2

make number of visible reactions a vanilla setting fef 2022-11-30 14:59:37 +00:00
47d0271957

make number of displayed reactions a setting fef 2022-11-30 13:20:20 +00:00
c19e74051c

change default reaction limit to 1 fef 2022-11-30 12:01:34 +00:00
38b8c494b8

limit number of reactions displayed fef 2022-11-30 09:06:14 +00:00
21b5bb587d

fix reaction margins and paddings fef 2022-11-29 09:07:10 +00:00
f129b47f13

cleanup frontend emoji reaction code fef 2022-11-29 08:54:35 +00:00
89a8c21f80

cleanup backend emoji reaction code fef 2022-11-29 08:15:52 +00:00
d862d9e06e

fix padding for reaction button fef 2022-11-29 06:25:43 +00:00
1b3df9b5e8

handle misskey reactions properly fef 2022-11-29 05:21:53 +00:00
da78479b93

move react button to action bar fef 2022-11-29 04:37:44 +00:00
19491d2032

cherry-pick emoji reaction changes fef 2022-11-29 04:31:22 +01:00
738433e46a

make frontend fetch reaction limit fef 2022-11-29 00:39:40 +00:00
200dd90a9f

make status reaction count limit configurable fef 2022-11-28 23:16:56 +00:00
83f0b5f288

remove accidentally created file fef 2022-11-28 22:25:12 +00:00
cc71e734c4

federate emoji reactions fef 2022-11-28 22:23:13 +00:00
ff379c7fd0

show reactions in detailed status view fef 2022-11-25 23:02:40 +00:00
dcea57a808

add frontend for emoji reactions fef 2022-11-24 17:30:52 +00:00
7facf831e1

add backend support for status emoji reactions fef 2022-11-24 11:50:32 +00:00
de21695162

New Crowdin updates (#22354) Eugen Rochko 2022-12-20 15:02:47 +01:00
ba15694003

Add ukrainian translations (#1959) www-cat 2022-12-20 11:47:03 +00:00
ee71d42c29

Add missing translation keys (#2010) Plastikmensch 2022-12-20 12:45:53 +01:00
749c360ba0

Reuse upstream's “Posts and replies” as column heading (#2023) Claire 2022-12-20 12:37:14 +01:00
628b350516

Bump fog-openstack from 0.3.2 to 0.3.10 (#22542) dependabot[bot] 2022-12-20 19:44:56 +09:00
919747322f

Bump scenic from 1.6.0 to 1.7.0 (#22258) dependabot[bot] 2022-12-20 19:10:09 +09:00
c04b762b9c

Bump http from 5.1.0 to 5.1.1 (#22515) dependabot[bot] 2022-12-20 19:09:14 +09:00
ef09016f35

Bump pundit from 2.2.0 to 2.3.0 (#22516) dependabot[bot] 2022-12-20 19:08:53 +09:00
fcaeae7761

Bump fog-core from 2.1.0 to 2.3.0 (#22521) dependabot[bot] 2022-12-20 19:08:22 +09:00
6a1d41635b

Bump sass from 1.56.2 to 1.57.0 (#22519) dependabot[bot] 2022-12-20 19:07:56 +09:00
3ce601ab86 Merge remote-tracking branch 'mastodon/main' neatchee 2022-12-19 17:31:21 -08:00
c1de673060

Fix suspension worker crashing on S3-compatible setups without ACL support (#22487) Claire 2022-12-19 17:55:17 +01:00
de36688db5 Merge remote-tracking branch 'glitch-soc/main' neatchee 2022-12-18 19:36:38 -08:00
f4581358ef Merge remote-tracking branch 'mastodon/main' neatchee 2022-12-18 19:36:25 -08:00
30992ac0e5 Embiggen the emoji picker! neatchee 2022-12-18 19:35:31 -08:00
2bad619d17

Change HTTP to HTTPS for links in CODE_OF_CONDUCT (#22465) Kai 2022-12-19 01:46:22 +01:00
465f9b690a Merge branch 'main' of github.com:neatchee/mastodon neatchee 2022-12-18 12:38:27 -08:00
3a54f693c3 New Crowdin updates (#22182) Eugen Rochko 2022-12-16 04:46:39 +01:00
d8492d3cd4 Run Prettier on YML files (#22345) Nick Schonning 2022-12-15 21:11:52 -05:00
b6a00a8375 Fix issue with glitch-soc theming Claire 2022-12-15 20:30:46 +01:00
5417fb2474 Fix single name variables on controller folder (#20092) David Vega 2022-12-15 08:11:58 -08:00
ee6b04ed7a Fix missing Javascript in domain block import confirmation page (#21471) Claire 2022-12-15 15:47:23 +01:00
b4fe3378a0 Fix bad footer update neatchee 2022-12-14 02:40:11 -08:00
342f3a28ff Add halcyon link to the footer neatchee 2022-12-13 23:51:19 -08:00
10b69f4fa2 Add alternative UI signon button for halcyon James Moy 2022-12-12 18:32:36 -05:00
33ebb43c27 Add new styles. James Moy 2022-12-03 09:12:25 -05:00
d78160e9ad Added Sakura flavour theme for Glitch style. Provided by https://github.com/chikorita157/mastodon-mods James Moy 2022-11-23 11:35:39 -05:00
06b68490d1

Enable eslint:recommended ruleset (#22433) Nick Schonning 2022-12-18 10:51:37 -05:00
181ad9ef93

Update schema.rb v4.0.2+1.1.1 Jeremy Kescher 2022-12-18 04:29:35 +01:00
eded36676f

Fix status reactions preventing an on_cascade delete Jeremy Kescher 2022-12-18 03:07:06 +01:00
3c0af10676

Reword the info for emoji reactions a bit lol Jeremy Kescher 2022-12-17 12:35:52 +01:00
f5ca11b082

Update CatCatNya .env file v4.0.2+1.1.0 Jeremy Kescher 2022-12-17 12:12:45 +01:00
f35d92b8e9

Merge remote-tracking branch 'upstream/main' into develop Jeremy Kescher 2022-12-17 12:09:58 +01:00
719a0951af

[Glitch] Fix being unable to react with the keycap number sign emoji (#2004) Jeremy Kescher 2022-12-17 10:34:39 +00:00
cbac1b3a95

Add info about emoji reactions Jeremy Kescher 2022-12-17 11:32:53 +01:00
0406f173cf

Merge remote-tracking branch 'reactions/main' into develop Jeremy Kescher 2022-12-17 11:09:05 +01:00
9384e7b712 Merge remote-tracking branch 'mastodon/main' neatchee 2022-12-16 11:47:53 -08:00
2b242ca5fd Merge remote-tracking branch 'glitch-soc/main' neatchee 2022-12-16 11:20:46 -08:00
2e7620f2c0 [Glitch] Add follow request banner on account header Claire 2022-12-15 18:50:11 +01:00
405d68915c [Glitch] Fix language surrounding disability in prompts for alt text and other media descriptions Holden Foreman 2022-12-15 12:46:13 -05:00
505c1e1ccf [Glitch] Fix media markup Bramus! 2022-12-15 18:37:47 +01:00
bcfaffebb7 [Glitch] Fix being stuck in edit mode when deleting the edited status Claire 2022-12-15 17:47:43 +01:00
63d131983e [Glitch] Display search popout at fixed screen position Rens Groothuijsen 2022-12-15 17:38:50 +01:00
feffd6efde [Glitch] Add transparancy to modal background for accessibility Terence Eden 2022-12-15 16:38:35 +00:00
9d939343f7 [Glitch] Fix margin for search field on medium window size Mina Her 2022-12-16 01:24:38 +09:00
126564c6f3 [Glitch] set activation for tag follow button Meisam 2022-12-15 17:04:52 +01:00
5e62987efe [Glitch] Fix the top action bar appearing in multi-column layout Claire 2022-12-15 16:40:45 +01:00
d26cd7ac6c [Glitch] Fix typo in handler function call name Nick Schonning 2022-12-15 10:37:17 -05:00
716c6b5e02 [Glitch] Increase the width of the unread notification border. Connor Shea 2022-12-15 08:37:07 -07:00
48b67710e7 [Glitch] Render current day formats in the client timezone Francis Murillo 2022-12-15 15:35:25 +00:00
6dac652c15 [Glitch] FormattedMessage must be used directly Yamagishi Kazutoshi 2022-12-16 00:20:46 +09:00
aac24a91b9 [Glitch] Adding 12 hours option for polls Pleclown 2022-12-15 16:20:34 +01:00
353468fccf [Glitch] Fix hidden label causing accessibility issue for search inputs Alex Stine 2022-12-15 09:20:21 -06:00
bf3386e785 [Glitch] Fix profile avatar being slightly offset into left border Riedler 2022-12-15 15:57:02 +01:00
2f70d99c85 [Glitch] Change dropdown menu to contain “Copy link to post” even for non-public posts Claire 2022-12-15 15:43:16 +01:00
e6717e694d [Glitch] Fix wasteful request to /api/v1/custom_emojis when not logged in Claire 2022-12-15 14:07:34 +01:00
5b4adad590 Fix issue with glitch-soc theming Claire 2022-12-15 20:30:46 +01:00
3aa2ca105c Add Western Frisian support (#18602) Yamagishi Kazutoshi 2022-12-16 03:03:44 +09:00
c5f6d53be6 Remove packages that are provided by Heroku stacks (#19836) zunda 2022-12-15 17:55:29 +00:00
0fb8618699 Add left and right margin to emojis (#20464) Douglas Blank 2022-12-15 09:53:37 -08:00
354bafd484 Add follow request banner on account header (#20785) Claire 2022-12-15 18:50:11 +01:00
fc6e1a801c Dont use reserved foldername (#20582) Matt Williams 2022-12-15 17:49:43 +00:00
4eae5703af Fix language surrounding disability in prompts for alt text and other media descriptions (#20923) Holden Foreman 2022-12-15 12:46:13 -05:00
0c31e96832 Add Southern Sami, and Lule Sami to language list under the ISO-639-3 standard (#21262) Jullan-M 2022-12-15 18:42:48 +01:00
0c4038406d fix: remove SMTP_SERVER (#21342) Christopher Nethercott 2022-12-15 17:42:08 +00:00
26bab6f6e3 Ensure exact match is the first result in hashtag searches (#21315) Claire 2022-12-15 18:41:40 +01:00
0030b7b526 Fix media markup (#21420) Bramus! 2022-12-15 18:37:47 +01:00
1b72931f23 Update circleci (#21880) Shlee 2022-12-16 03:43:13 +10:30
8867f14c43 Change remote media files to be downloaded outside of transactions (#21796) Claire 2022-12-15 18:09:48 +01:00
467ba396a4 Fix idempotency when database writes are slow (#21840) Brian Campbell 2022-12-15 12:08:40 -05:00
fa40d4edc0 Fix being stuck in edit mode when deleting the edited status (#22126) Claire 2022-12-15 17:47:43 +01:00
b0df562fbe Fix changing domain block severity not undoing individual account effects (#22135) Claire 2022-12-15 17:45:02 +01:00
e6a62d9f64 Align everything to Node.js 16 (#22223) Effy Elden 2022-12-16 03:43:26 +11:00
077b10d6cd Fix attachment rendering of edited posts in OpenGraph (#22270) Claire 2022-12-15 17:41:20 +01:00
d080dcbac1 Improve devcontainer for running tests (#22277) Avdi Grimm 2022-12-15 10:40:36 -06:00
8f461f9318 Display search popout at fixed screen position (#16463) Rens Groothuijsen 2022-12-15 17:38:50 +01:00
c2b5c85a01 Add transparancy to modal background for accessibility (#18081) Terence Eden 2022-12-15 16:38:35 +00:00
3df925a831 Don't autofocus the compose form (#16517) Arnout Engelen 2022-12-15 17:37:05 +01:00
c456186c7a Add "disabled" user filter for admin/accounts UI (#21282) Jeong Arm 2022-12-16 01:30:47 +09:00
b12ed2184a Fix margin for search field on medium window size (#21606) Mina Her 2022-12-16 01:24:38 +09:00
f365abeefd Fix single name variables on controller folder (#20092) David Vega 2022-12-15 08:11:58 -08:00
ad53f2c477 Save avatar or header correctly even if other one fails (#18465) Jeong Arm 2022-12-16 01:11:14 +09:00
17f43bf460 Remove inline-css in logo (#20814) Luxiaba 2022-12-16 00:10:34 +08:00
c532fd4680 Add brotli compression (#19025) Yurii Izorkin 2022-12-15 19:07:36 +03:00
fd266d98f7 Fix punycoded local domains not being prettified in initial state (#21440) Matthías Páll Gissurarson 2022-12-15 17:05:40 +01:00
0f74047a69 set activation for tag follow button (#21629) Meisam 2022-12-15 17:04:52 +01:00
3d1f4af165 Fix inability to use local LibreTranslate without setting ALLOWED_PRIVATE_ADDRESSES (#21926) Claire 2022-12-15 17:04:38 +01:00
f7fa5e21b7 Add explanation text to log-in page (#20946) Claire 2022-12-15 16:44:29 +01:00
50164172da Add Montenegrin (cnr) (#21013) Fries 2022-12-15 16:40:57 +01:00
724cc97f78 Fix the top action bar appearing in multi-column layout (#20943) Claire 2022-12-15 16:40:45 +01:00
b2bd0bc498 Change CSP directives on API to be tight and concise (#20960) Claire 2022-12-15 16:40:32 +01:00
de61ed7e02 linting: RuboCop update, config fixes (#20574) Kaspar V 2022-12-15 16:39:59 +01:00
f2c9a0b8f1 Use Rails tag API to build RSS feed for spoilers and polls (#20163) Neil Matatall 2022-12-15 05:39:41 -10:00
9f67bdb882 Fix default S3_HOSTNAME used in mastodon:setup (#19932) Dan Peterson 2022-12-15 11:38:51 -04:00
3a45630192 Add environment variable to configure sidekiq concurrency (#19589) Colin Mitchell 2022-12-15 10:38:37 -05:00
462db0a8f4 Fix typo in handler function call name (#21829) Nick Schonning 2022-12-15 10:37:17 -05:00
ff090479ab Increase the width of the unread notification border. (#21692) Connor Shea 2022-12-15 08:37:07 -07:00
2adf8999a2 Render current day formats in the client timezone (#21878) Francis Murillo 2022-12-15 15:35:25 +00:00
1b6f444195 Add localization for new admin scopes (#20979) trwnh 2022-12-15 09:21:13 -06:00
2db8c0a45e Fix typo in application_helper_spec.rb (#20981) Ikko Ashimine 2022-12-16 00:20:55 +09:00
35e006335c FormattedMessage must be used directly (#20982) Yamagishi Kazutoshi 2022-12-16 00:20:46 +09:00
aedc584bec Adding 12 hours option for polls (#21131) Pleclown 2022-12-15 16:20:34 +01:00
822ec74992 Fix hidden label causing accessibility issue for search inputs (#21275) Alex Stine 2022-12-15 09:20:21 -06:00
be822db9ff Embed js height fix (#22141) Matt Hodges 2022-12-15 09:18:59 -06:00
e9d767e324 Fix being unable to react with the keycap number sign emoji (#22231) Jeremy Kescher 2022-12-15 15:18:39 +00:00
41caa44187 Fix N+1 queries from in NotificationsController (#21202) nametoolong 2022-12-15 23:18:20 +08:00
209beaa1a6 Fix typos in source documentation (#21046) luzpaz 2022-12-15 09:57:26 -05:00
a1c36d8d09 Add hadolint as Dockerfile linter (#20993) Moritz Heiber 2022-12-15 15:57:17 +01:00
e0fba1a615 Fix profile avatar being slightly offset into left border (fixes #20822) (#20994) Riedler 2022-12-15 15:57:02 +01:00
67eee4c6e4 Fix crash in elasticsearch_check.rb (#21006) s0 2022-12-16 01:56:48 +11:00
b91a4a98ba Allow adding relays while secure mode & limited federation mode are enabled (#22324) Effy Elden 2022-12-16 01:56:05 +11:00
6a2b39d746 Fix invalid CSS for links in warning and strike cards (#22302) Claire 2022-12-15 15:52:18 +01:00
57e17773b7 Don't delivery a reply to domains which are blocked by author (#22117) Jeong Arm 2022-12-15 23:52:06 +09:00
c132d4867d Add CodeQL workflow (#21894) Justin Hutchings 2022-12-15 06:51:13 -08:00
02870840ba Fix missing Javascript in domain block import confirmation page (#21471) Claire 2022-12-15 15:47:23 +01:00
11d38d8409 Revoke all authorized applications on password reset (#21325) Francis Murillo 2022-12-15 14:47:06 +00:00
4cb598afbe Change dropdown menu to contain “Copy link to post” even for non-public posts (#21316) Claire 2022-12-15 15:43:16 +01:00
80a88d2277 Validate nodeinfo response by schema (#21395) Meisam 2022-12-15 15:43:05 +01:00
f6b252c977 Add --email and --dry-run options to tootctl accounts delete (#22328) Claire 2022-12-15 14:52:50 +01:00
ab6aa7a1ab Allow admins to refresh remotely-suspended accounts (#22327) Claire 2022-12-15 14:15:50 +01:00
e7d69f3228 Fix wasteful request to /api/v1/custom_emojis when not logged in (#22326) Claire 2022-12-15 14:07:34 +01:00
a1a1d08890

Merge remote-tracking branch 'upstream/main' into develop v4.0.2+1.0.13 Jeremy Kescher 2022-12-16 17:51:24 +01:00
7ca0a71601

Merge pull request #2014 from ClearlyClaire/glitch-soc/merge-upstream Claire 2022-12-16 11:50:35 +01:00
2889c68610

New Crowdin updates (#22182) Eugen Rochko 2022-12-16 04:46:39 +01:00
3c70f0a9c9

Run Prettier on YML files (#22345) Nick Schonning 2022-12-15 21:11:52 -05:00
0912fb736d [Glitch] Add follow request banner on account header Claire 2022-12-15 18:50:11 +01:00
c459625119 [Glitch] Fix language surrounding disability in prompts for alt text and other media descriptions Holden Foreman 2022-12-15 12:46:13 -05:00
1ced365371 [Glitch] Fix media markup Bramus! 2022-12-15 18:37:47 +01:00
cdba1ec5f4 [Glitch] Fix being stuck in edit mode when deleting the edited status Claire 2022-12-15 17:47:43 +01:00
d7a6a9393a [Glitch] Display search popout at fixed screen position Rens Groothuijsen 2022-12-15 17:38:50 +01:00
89d3d85cf2 [Glitch] Add transparancy to modal background for accessibility Terence Eden 2022-12-15 16:38:35 +00:00
0f5ecb3860 [Glitch] Fix margin for search field on medium window size Mina Her 2022-12-16 01:24:38 +09:00
7883ba34bb [Glitch] set activation for tag follow button Meisam 2022-12-15 17:04:52 +01:00
602f18103c [Glitch] Fix the top action bar appearing in multi-column layout Claire 2022-12-15 16:40:45 +01:00
57eab6dbee [Glitch] Fix typo in handler function call name Nick Schonning 2022-12-15 10:37:17 -05:00
e76fb9b2c4 [Glitch] Increase the width of the unread notification border. Connor Shea 2022-12-15 08:37:07 -07:00
b22da94a65 [Glitch] Render current day formats in the client timezone Francis Murillo 2022-12-15 15:35:25 +00:00
9f3cc9e555 [Glitch] FormattedMessage must be used directly Yamagishi Kazutoshi 2022-12-16 00:20:46 +09:00
98f7b3657a [Glitch] Adding 12 hours option for polls Pleclown 2022-12-15 16:20:34 +01:00
aad42cfc35 [Glitch] Fix hidden label causing accessibility issue for search inputs Alex Stine 2022-12-15 09:20:21 -06:00
8cd7b95559 [Glitch] Fix profile avatar being slightly offset into left border Riedler 2022-12-15 15:57:02 +01:00
65cc5cb891 [Glitch] Change dropdown menu to contain “Copy link to post” even for non-public posts Claire 2022-12-15 15:43:16 +01:00
1e8aff072a [Glitch] Fix wasteful request to /api/v1/custom_emojis when not logged in Claire 2022-12-15 14:07:34 +01:00
b70c2e2167 Fix issue with glitch-soc theming Claire 2022-12-15 20:30:46 +01:00
f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream Claire 2022-12-15 20:25:25 +01:00
f847f67410

Add Western Frisian support (#18602) Yamagishi Kazutoshi 2022-12-16 03:03:44 +09:00
d13702ac06

Fix status cache hydration discrepancy (#19879) Claire 2022-12-15 18:55:55 +01:00
10370d316a

Remove packages that are provided by Heroku stacks (#19836) zunda 2022-12-15 17:55:29 +00:00
2c7df002fa

Add left and right margin to emojis (#20464) Douglas Blank 2022-12-15 09:53:37 -08:00
70415714f1

Add follow request banner on account header (#20785) Claire 2022-12-15 18:50:11 +01:00
7a3c6bb888

Dont use reserved foldername (#20582) Matt Williams 2022-12-15 17:49:43 +00:00
c761e7a5ef

Fix language surrounding disability in prompts for alt text and other media descriptions (#20923) Holden Foreman 2022-12-15 12:46:13 -05:00
b4fe2d1004

Add Southern Sami, and Lule Sami to language list under the ISO-639-3 standard (#21262) Jullan-M 2022-12-15 18:42:48 +01:00
c649f4d386

fix: remove SMTP_SERVER (#21342) Christopher Nethercott 2022-12-15 17:42:08 +00:00
bf1c7e2122

Ensure exact match is the first result in hashtag searches (#21315) Claire 2022-12-15 18:41:40 +01:00
7fbc17afa2

Fix media markup (#21420) Bramus! 2022-12-15 18:37:47 +01:00
99d2693071

Update circleci (#21880) Shlee 2022-12-16 03:43:13 +10:30
2644a28cb3

Change remote media files to be downloaded outside of transactions (#21796) Claire 2022-12-15 18:09:48 +01:00
2d12948220

Fix idempotency when database writes are slow (#21840) Brian Campbell 2022-12-15 12:08:40 -05:00
ebf1d74e40

Fix being stuck in edit mode when deleting the edited status (#22126) Claire 2022-12-15 17:47:43 +01:00
8556a649d5

Fix changing domain block severity not undoing individual account effects (#22135) Claire 2022-12-15 17:45:02 +01:00
1e49be3328

Align everything to Node.js 16 (#22223) Effy Elden 2022-12-16 03:43:26 +11:00
fb1d9789db

Fix attachment rendering of edited posts in OpenGraph (#22270) Claire 2022-12-15 17:41:20 +01:00
8a56587d62

Improve devcontainer for running tests (#22277) Avdi Grimm 2022-12-15 10:40:36 -06:00
726c7dea31

Display search popout at fixed screen position (#16463) Rens Groothuijsen 2022-12-15 17:38:50 +01:00