Jeremy Kescher
abb21a1eab
Merge branch 'glitch-soc' into develop
2024-01-04 17:30:03 +01:00
Jeremy Kescher
42520e72c5
Remove duplicate "Number of visible reactions" setting
2024-01-03 17:55:12 +01:00
Claire
b3d871d3a4
Add PAPERCLIP_ROOT_URL to Content-Security-Policy when used
...
(backports https://github.com/mastodon/mastodon/pull/28561 )
2024-01-02 17:38:32 +01:00
Jeremy Kescher
b18cd3f4bd
fix: check for limited_federation_mode instead of removed whitelist_mode
2024-01-02 13:55:07 +01:00
Jeremy Kescher
5be3fb3d66
Merge remote-tracking branch 'essem/feature/emoji-reactions' into merge/emoji-reactions
2024-01-02 12:16:35 +01:00
Essem
b8d7a1c07a
Check for content attribute in Misskey likes
2023-12-29 12:39:02 -06:00
Essem
67190e09f0
Add reaction notification column settings
...
This was in a previous PR. Not quite sure how it didn't carry over.
2023-12-29 12:39:02 -06:00
Essem
9670ba6a1b
More cleanup
2023-12-29 12:39:01 -06:00
Essem
01b6cbe577
Linting fixes
2023-12-29 12:39:01 -06:00
Essem
8eda40cfb3
Refactor react services
2023-12-29 12:39:01 -06:00
Essem
421e3ea8ba
Fix reblog reactions
2023-12-29 12:33:13 -06:00
Essem
08a21c1af6
Add notification emails for reactions
2023-12-29 12:33:13 -06:00
Essem
6ae86f40d1
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>
2023-12-29 12:33:13 -06:00
Claire
eb342a6082
Fix media attachments not being hidden in report modal in glitch flavor
2023-12-29 17:47:30 +01:00
Cal Moody
df43bb124c
[Glitch] Fix destructive actions in dropdowns not using error color in light theme
...
Port 3599622b5b
2023-12-29 17:43:53 +01:00
Claire
35b6583371
Merge commit '6374358357ee81b5f137f471f028a56974109155' into glitch-soc/merge-upstream
2023-12-29 17:40:57 +01:00
Claire
6374358357
Change media to be hidden/blurred by default in report modal ( #28522 )
2023-12-29 16:34:13 +00:00
Claire
fcfdeadc04
Fix random NoMethodError errors on cached CustomFilter objects ( #28521 )
2023-12-29 16:23:07 +00:00
Cal Moody
3599622b5b
Fix destructive actions in dropdowns not using error color in light theme ( #28484 )
2023-12-29 11:32:40 +00:00
Matt Jankowski
ba5f659bb3
Use shorter attribute query methods in Announcement ( #28474 )
2023-12-29 10:55:50 +00:00
github-actions[bot]
7df9c4f6f3
New Crowdin Translations (automated) ( #28481 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-29 10:39:10 +00:00
Matt Jankowski
128c5b7db3
Fix Performance/StringIdentifierArgument cop ( #28508 )
2023-12-29 10:23:30 +00:00
Santiago Kozak
1cba91d6d1
Fix reply icon display in picture-in-picture footer ( #28519 )
2023-12-29 09:48:27 +00:00
Claire
c5b0e6d5a0
Merge branch 'main' into glitch-soc/merge-upstream
2023-12-28 16:57:10 +01:00
Claire
19e14654cc
Reduce CSP configuration changes with upstream ( #2536 )
2023-12-27 09:54:05 +01:00
Claire
ea6c187fca
Fix media attachment order of remote posts ( #28469 )
2023-12-22 18:45:36 +01:00
Claire
72ff0d30d8
Fix submitting post from content warning field not working properly ( #2538 )
2023-12-22 17:23:15 +01:00
Claire
2bf84b93d4
Fix media attachment order of remote posts ( #28469 )
2023-12-22 15:10:39 +00:00
github-actions[bot]
e70a65761a
New Crowdin Translations (automated) ( #28467 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-22 07:58:20 +00:00
Renaud Chaput
1c041356a1
Fix error on viewing a profile when unlogged ( #28465 )
2023-12-21 20:19:18 +00:00
Claire
92aa6e2ec9
Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream
2023-12-21 19:42:13 +01:00
Claire
30ee7339d3
Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/form/admin_settings.rb`:
Upstream changed code style change, including on a line modified by glitch-soc.
Kept glitch-soc's line but with the code style change applied.
2023-12-21 19:31:12 +01:00
Claire
f5b7307890
Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's version of the conflicting lines.
2023-12-21 19:24:10 +01:00
Claire
7a0be26367
[Glitch] Fix empty column explainer getting cropped under certain conditions
...
Port 3f1ec16377
2023-12-21 19:08:43 +01:00
Claire
a60b9acf3c
Merge commit 'b2f915b31ae884e3893e93a99da4e2b8d7e9ef7b' into glitch-soc/merge-upstream
2023-12-21 19:04:20 +01:00
Claire
6e56f95285
Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream modified its README, we have a completely different one.
Kept our README file.
2023-12-21 18:17:17 +01:00
Eugen Rochko
5976d3702f
Change "Follow" to "Follow back" and "Mutual" when appropriate in web UI ( #28452 )
2023-12-21 09:44:09 +00:00
github-actions[bot]
9e5ddc1745
New Crowdin Translations (automated) ( #28451 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-21 09:09:00 +00:00
Eugen Rochko
01f0a6ca4f
Fix profile setup showing default avatar in web UI ( #28453 )
2023-12-21 08:32:25 +00:00
Claire
9ac13bbc9c
Fix glitch-only HAML linting issue
2023-12-20 22:27:29 +01:00
Matt Jankowski
01e77a0f34
[Glitch] Enable the eslint react/no-unknown-property rule
...
Port ee83d5c760
2023-12-20 22:24:40 +01:00
Claire
077e0c6812
Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Conflict caused by the `json` gem thing once again.
Updated as upstream did, but keeping the most recent `json` version.
- `spec/helpers/application_helper_spec.rb`:
Upstream refactored a bunch of specs, including one place that differs
because of glitch-soc's theming system.
Refactored as upstream did, adapting it for glitch-soc's theming system.
2023-12-20 22:16:50 +01:00
Claire
75580360cd
Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream fixed a bunch lint issues, and changed the `Max` parameter of the
`Metrics/AbcSize` cop.
Glitch-soc has different code and slightly higher `AbcSize` complexity,
modified the `.rubocop_todo.yml` file accordingly.
- `app/policies/status_policy.rb`:
Upstream changed `account.suspended?` to `account.unavailable?` to prepare
for delete flags. Glitch-soc has additional local-only conditions.
Ported upstream's refactor while keeping glitch-soc's additional condition.
- `app/serializers/initial_state_serializer.rb`:
Upstream refactored a bunch of stuff while glitch-soc has more settings.
Refactored as upstream did while keeping glitch-soc's settings.
2023-12-20 22:05:31 +01:00
Claire
5de551002d
[Glitch] Fix onboarding step descriptions being truncated on narrow screens
...
Port b20af17a2c
2023-12-20 21:59:58 +01:00
Claire
8a5f2442cc
Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream
2023-12-20 21:58:18 +01:00
Claire
b41af99673
[Glitch] Change dismissed banners to be stored server-side
...
Port 7faa27e17d
2023-12-20 20:40:47 +01:00
Claire
b8209c3b96
Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream reworked the CSP, we kept our version for now.
- `spec/requests/content_security_policy_spec.rb`:
Upstream reworked the CSP, we kept our version for now.
2023-12-20 20:10:45 +01:00
Renaud Chaput
a4a728b01d
[Glitch] Fix the loading bar with the new Redux actions
...
Port 8b1eeb2f90
2023-12-20 19:49:44 +01:00
Claire
93c71e2c7c
[Glitch] Fix notification sounds
...
Port f3864db409
2023-12-20 19:49:44 +01:00
Claire
70652e49eb
[Glitch] Fix error when muting users from Web UI
...
Port 32319187ee
2023-12-20 19:49:44 +01:00
