UnionRoom
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
mastodon/app/views/admin
History
Claire be493b6c0d Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/account.rb`:
  Not a real conflict, just upstream getting rid of unused constants too close
  to glitch-soc-specific contents.
  Removed unused constants like upstream did.
- `app/models/trends.rb`:
  Conflict because glitch-soc disabled email notifications for trending links.
  Upstream has refactored this quite a bit and added trending posts.
  Took upstream code, but disabling the extra trending stuff will come in
  another commit.
- `app/views/admin/trends/links/index.html.haml`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes accordingly.
 		2022-02-26 09:29:23 +01:00
..
account_actions Add inline description of moderation actions in moderation interface (#15792) 2021-02-24 16:53:16 +01:00
account_warnings Fix link colors in report and strike details (#17616) 2022-02-22 15:27:25 +01:00
accounts Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
action_logs Merge branch 'main' into glitch-soc/merge-upstream 2022-01-17 10:45:25 +01:00
announcements Fix design of announcements in admin UI (#12989) 2020-01-28 02:21:00 +01:00
change_emails
…
custom_emojis Merge branch 'main' into glitch-soc/merge-upstream 2022-02-26 09:29:23 +01:00
dashboard Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
disputes/appeals Fix issue with glitch-soc's theming system 2022-02-17 10:59:01 +01:00
domain_allows Fix upstream changes breaking because of glitch-soc's theming engine 2019-09-13 20:28:22 +02:00
domain_blocks Merge branch 'master' into glitch-soc/merge-upstream 2020-12-19 00:55:12 +01:00
email_domain_blocks Change e-mail domain blocks to block IPs dynamically (#17635) 2022-02-24 17:28:23 +01:00
follow_recommendations Merge branch 'main' into glitch-soc/merge-upstream 2022-02-26 09:29:23 +01:00
instances Enable domain purge button on suspended domains too (#17209) 2022-02-11 22:23:19 +01: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 error on account relationships page in admin UI (#17444) 2022-02-05 05:06:34 +01:00
relays Display pending message on admin relays UI (#8494) 2018-08-28 05:39:43 +02:00
report_notes Add appeals (#17364) 2022-02-14 21:27:53 +01:00
reports Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
rules Fix missing source strings and inconsistent lead text style in admin UI (#16052) 2021-04-17 11:12:49 +02:00
settings Change CAPTCHA handling to be only on email verification 2022-01-25 23:56:57 +01:00
statuses Merge branch 'main' into glitch-soc/merge-upstream 2022-01-17 10:45:25 +01:00
tags Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
trends Merge branch 'main' into glitch-soc/merge-upstream 2022-02-26 09:29:23 +01:00
warning_presets Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00