Commit graph

23 commits

Author SHA1 Message Date
Essem
ce98ee9b00
Merge remote-tracking branch 'upstream/main' 2024-04-10 17:36:38 -05:00
Claire
1d1c3a808a Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream
Conflicts:
- `app/models/user_settings.rb`:
  Upstream removed a setting textually adjacent to a glitch-soc-only setting.
  Removed the setting glitch-soc removed.
2024-04-06 21:01:40 +02:00
Claire
37ca59815c
Remove setting for unfollow confirmation modal, and make it unconditional (#29373) 2024-03-22 16:24:04 +00:00
Essem
5222d41546
Add notification emails for reactions 2023-11-10 15:16:29 -06:00
Essem
b871816f0e
Merge remote-tracking branch 'upstream/main' 2023-09-04 19:00:18 -05:00
Claire
c107512fa6 Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream 2023-09-02 15:02:29 +02:00
Claire
16681e0f20
Add admin notifications for new Mastodon versions (#26582) 2023-09-01 17:47:07 +02:00
Essem
0451c28535
Merge remote-tracking branch 'upstream/main' 2023-08-24 13:51:53 -05:00
Claire
452f15be78 Move glitch-soc's “Hide followers count” setting to “Show followers count” under “Privacy and reach” tab 2023-08-22 19:50:37 +02:00
Claire
2126812f65 Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some settings, where glitch-soc has an extra setting.
  Ported upstream changes, moving the same settings as them.
2023-08-22 18:31:28 +02:00
Claire
fc5ab2dc83
Add privacy tab in profile settings (#26484)
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-08-14 18:52:45 +02:00
Essem
695d86d3e9
Merge remote-tracking branch 'plastikmensch/set-default-content-type-from-settings-yml' 2023-08-10 12:46:13 -05:00
Plastikmensch
c57d730d5b
Set default_content_type default from settings.yml
Glitch-soc used to allow setting the default content type for new users by changing the setting in settings.yml.

Since the refactor of user settings, changing it had no effect.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-08-09 16:22:48 +02:00
Essem
d9ea6abec0
Merge remote-tracking branch 'upstream/main' 2023-07-31 12:24:48 -05:00
Claire
bd349cb850 Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream
Conflicts:
- `db/schema.rb`:
  Upstream regenerated the schema file using Rails 7, the conflicts are
  caused by our extra columns.
  Applied upstream's changes, but keeping our extra columns.
2023-07-30 14:58:56 +02:00
Eugen Rochko
4d01d1a1ee
Remove 16:9 cropping from web UI (#26132) 2023-07-24 13:46:55 +02:00
Essem
f426885fa2
Merge remote-tracking branch 'upstream/main' 2023-07-01 19:45:24 -05:00
Claire
178e151019 Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream
Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a constraint on a setting textually close
  to glitch-soc-only settings.
  Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for the `translate` attribute on a few elements,
  where glitch-soc had a different set of allowed elements and attributes.
  Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored to use RSpec's `instance_double` instead of `double`,
  but glitch-soc had changes to tests due to configurable max toot chars.
  Applied upstream's changes while keeping tests against configurable max
  toot chars.
2023-06-25 14:27:38 +02:00
Claire
ec91ea4457
Fix missing validation on default_privacy setting (#25513) 2023-06-20 18:32:14 +02:00
Claire
dd07393e75
Fix user settings not getting validated (#25508) 2023-06-19 14:06:06 +01:00
Jeremy Kescher
9fda65a4ca Migrate emoji reactions 2023-04-04 15:23:54 -07:00
Claire
3dcba94e68 Migrate glitch-soc's exclusive user settings 2023-03-31 22:50:57 +02:00
Eugen Rochko
a9b5598c97
Change user settings to be stored in a more optimal way (#23630)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-30 14:44:00 +02:00