mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mastodon-glitch/app/views/admin
History
Claire 4ed629cd7e Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream added the notion of overriden settings, while we had extra code for
  pseudo-settings (only used to combine flavour and skin in a single select
  field).
  Ported upstream changes.
- `config/i18n-tasks.yml`:
  Upstream added `simple_form.overridden` to `ignore_unused`,
  we had `simple_form.glitch_only`.
  Added `simple_form.glitch_only` as well.
 		2023-09-02 14:44:47 +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 Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
action_logs Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
announcements Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
change_emails Fix more haml-lint Rubocop (#24107) 2023-03-15 20:07:43 +01:00
custom_emojis Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
dashboard Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
disputes/appeals Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
domain_allows Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
domain_blocks Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
email_domain_blocks Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +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 Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
follow_recommendations Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
instances Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
invites
…
ip_blocks Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +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 Update haml-lint 0.49.1 (#26118) 2023-07-23 17:48:16 +02:00
report_notes Change account moderation notes to make links clickable (#22553) 2023-01-18 16:32:23 +01:00
reports Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
roles Update haml-lint 0.49.1 (#26118) 2023-07-23 17:48:16 +02:00
rules Setup haml-lint CI with todo config (#23524) 2023-03-15 04:15:36 +01:00
settings Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream 2023-09-02 14:44:47 +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 Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
tags Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
trends Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +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