AkkomaGang/masto-fe
2
2
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity
masto-fe/app/controllers/admin
History
Claire cd87d7dcef Merge branch 'main' into glitch-soc/merge-upstream 
- `.env.production.sample`:
  Our sample config file is very different from upstream since it is much more
  complete. Upstream added documentation for a few env variables.
  Copied the new variables/documentation from upstream.
- `app/lib/feed_manager.rb`:
  Upstream added a timeline type (hashtags), while glitch-soc already had an
  extra one (direct messages). Not really a conflict but textually close
  changes.
  Ported upstream's changes.
- `app/models/custom_emoji.rb`:
  Upstream upped the custom emoji size limit, while glitch-soc had configurable
  limits.
  Upped the default limits accordingly.
- `streaming/index.js`:
  Upstream reworked how hastags were normalized. Minor conflict due to
  glitch-soc's handling of instance-local posts.
  Ported upstream's changes.
2022-07-17 22:07:20 +02:00
..
disputes Add appeals (#17364) 2022-02-14 21:27:53 +01:00
reports Add ability to mark statuses as sensitive from reports in admin UI (#17668) 2022-03-01 22:20:29 +01:00
trends Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
users Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
webhooks Add administrative webhooks (#18510) 2022-06-09 21:57:36 +02:00
account_actions_controller.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
account_moderation_notes_controller.rb Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01:00
accounts_controller.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
action_logs_controller.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
announcements_controller.rb Change order of announcements in admin page to sort them newest-first (#15091) 2020-11-04 21:15:22 +01:00
base_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
change_emails_controller.rb Feature: Allow staff to change user emails (#7074) 2018-04-10 09:16:06 +02:00
confirmations_controller.rb Move #set_user to Admin::BaseController (#9470) 2018-12-17 11:40:51 +01:00
custom_emojis_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
dashboard_controller.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
domain_allows_controller.rb Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
domain_blocks_controller.rb Fix authorization check in domain blocks controller 2022-07-05 11:57:30 +02:00
email_domain_blocks_controller.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
export_domain_allows_controller.rb Allow import/export of instance-level domain blocks/allows (#1754) 2022-05-16 09:29:01 +02:00
export_domain_blocks_controller.rb Add confirmation page when importing blocked domains (#1773) 2022-05-16 18:26:49 +02:00
follow_recommendations_controller.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
instances_controller.rb Change design of federation pages in admin UI (#17704) 2022-03-09 08:52:32 +01:00
invites_controller.rb Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
ip_blocks_controller.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
relationships_controller.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
relays_controller.rb Fix relays UI being available in whitelist/secure mode (#11963) 2019-09-27 02:13:34 +02:00
report_notes_controller.rb Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01:00
reports_controller.rb Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01:00
resets_controller.rb Add ability to skip sign-in token authentication for specific users (#16427) 2021-07-08 05:31:28 +02:00
roles_controller.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
rules_controller.rb Add server rules (#15769) 2021-02-21 19:50:12 +01:00
settings_controller.rb Add validations to admin settings (#10348) 2019-03-23 14:07:04 +01:00
site_uploads_controller.rb Add ability to delete files uploaded for settings in admin UI (#13192) 2020-03-08 16:00:24 +01:00
statuses_controller.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
tags_controller.rb Change how hashtags are normalized (#18795) 2022-07-13 15:03:28 +02:00
warning_presets_controller.rb Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
webhooks_controller.rb Add administrative webhooks (#18510) 2022-06-09 21:57:36 +02:00