me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/app/views/admin
History
Claire b7af3115a7 Merge commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' 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
..
account_actions Fix more haml-lint Rubocop (#24107) 2023-03-15 20:07:43 +01:00
account_warnings Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01:00
accounts Merge branch 'main' into glitch-soc/merge-upstream 2023-03-16 23:12:59 +01:00
action_logs Merge branch 'main' into glitch-soc/merge-upstream 2023-03-16 23:12:59 +01:00
announcements Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
change_emails Fix more haml-lint Rubocop (#24107) 2023-03-15 20:07:43 +01:00
custom_emojis Merge branch 'main' into glitch-soc/merge-upstream 2023-03-16 23:12:59 +01:00
dashboard Merge branch 'main' into glitch-soc/merge-upstream 2023-03-16 23:12:59 +01:00
disputes/appeals Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
domain_allows Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
domain_blocks Merge commit '8ee98cfd2b01d96222c1559f35ef8b82732af620' into glitch-soc/merge-upstream 2023-06-10 15:09:19 +02:00
email_domain_blocks Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream 2023-06-10 16:22:14 +02:00
export_domain_allows Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597) 2022-11-17 11:05:09 +01:00
export_domain_blocks Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream 2023-06-10 16:22:14 +02:00
follow_recommendations Merge branch 'main' into glitch-soc/merge-upstream 2022-02-26 09:29:23 +01:00
instances Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream 2023-06-10 16:22:14 +02:00
invites Fix maxed-out invites not showing up as expired in UI (#10274) 2019-03-15 05:35:17 +01:00
ip_blocks Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream 2023-06-10 16:22:14 +02:00
relationships Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01:00
relays Display pending message on admin relays UI (#8494) 2018-08-28 05:39:43 +02:00
report_notes Change account moderation notes to make links clickable (#22553) 2023-01-18 16:32:23 +01:00
reports Merge commit 'afb74b97b237a32c5e1db2a6a9968d587a3d5dd3' into glitch-soc/merge-upstream 2023-05-25 20:43:25 +02:00
roles Consistently use middle dot (·) instead of bullet (•) to separate items (#25248) 2023-06-02 19:58:18 +02:00
rules Setup haml-lint CI with todo config (#23524) 2023-03-15 04:15:36 +01:00
settings Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream 2023-06-10 16:22:14 +02:00
status_edits Add ability to view previous edits of a status in admin UI (#19462) 2022-10-26 13:42:29 +02:00
statuses Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
tags Merge branch 'main' into glitch-soc/merge-upstream 2022-07-17 22:07:20 +02:00
trends Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream 2023-06-10 16:22:14 +02:00
users/roles Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
warning_presets Setup haml-lint CI with todo config (#23524) 2023-03-15 04:15:36 +01:00
webhooks Add finer permission requirements for managing webhooks (#25463) 2023-06-22 14:52:25 +02:00