me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/app/views/admin
History
Claire 077183a121 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/settings/preferences_controller.rb`:
  Upstream dropping `digest` from notifications emails while we have more
  notification emails settings.
  Removed `digest` from our list while keeping our extra settings.
- `app/javascript/packs/admin.js`:
  Conflicts caused by glitch-soc's theming system.
  Applied the changes to `app/javascript/core/admin.js`.
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream removed a setting close to a glitch-soc-only setting.
  Applied upstream's change.
2022-08-28 11:31:00 +02:00
..
account_actions Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +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 2022-08-28 11:31:00 +02:00
action_logs Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
announcements Fix design of announcements in admin UI (#12989) 2020-01-28 02:21:00 +01:00
change_emails Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01:00
custom_emojis Merge branch 'main' into glitch-soc/merge-upstream 2022-06-11 00:08:41 +02:00
dashboard Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
disputes/appeals Merge branch 'main' into glitch-soc/merge-upstream 2022-03-22 17:00:38 +01:00
domain_allows Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
domain_blocks Merge branch 'main' into glitch-soc/merge-upstream 2022-03-10 09:52:45 +01:00
email_domain_blocks Adapt view for glitch-soc's theming system 2022-02-26 09:46:13 +01:00
export_domain_allows Allow import/export of instance-level domain blocks/allows (#1754) 2022-05-16 09:29:01 +02:00
export_domain_blocks Add confirmation page when importing blocked domains (#1773) 2022-05-16 18:26:49 +02:00
follow_recommendations Merge branch 'main' into glitch-soc/merge-upstream 2022-02-26 09:29:23 +01:00
instances Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +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 branch 'main' into glitch-soc/merge-upstream 2021-12-16 16:20:44 +01: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 Fix error on attempting to delete an account moderation note (#18196) 2022-04-29 20:25:31 +02:00
reports Merge branch 'main' into glitch-soc/merge-upstream 2022-03-28 16:22:28 +02:00
roles Use type="color" on badge color input field (#18825) 2022-08-25 04:38:34 +02:00
rules Fix missing source strings and inconsistent lead text style in admin UI (#16052) 2021-04-17 11:12:49 +02:00
settings Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
statuses Merge branch 'main' into glitch-soc/merge-upstream 2022-03-22 17:00:38 +01:00
tags Merge branch 'main' into glitch-soc/merge-upstream 2022-07-17 22:07:20 +02:00
trends Merge branch 'main' into glitch-soc/merge-upstream 2022-07-17 22:07:20 +02:00
users/roles Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
warning_presets Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
webhooks Add administrative webhooks (#18510) 2022-06-09 21:57:36 +02:00