Thibaut Girka 249991c498 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml

2019-07-19 18:26:49 +02:00

..

account_actions_controller.rb

Redirect to reports overview instead of report after account action (#9639)

2018-12-27 03:42:29 +01:00

account_moderation_notes_controller.rb

Add moderation warnings (#9519)

2018-12-22 20:02:09 +01:00

accounts_controller.rb

Remove Salmon and PubSubHubbub (#11205)

2019-07-06 23:26:16 +02:00

action_logs_controller.rb

Add logging of admin actions (#5757)

2017-11-24 02:05:53 +01:00

base_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-12-18 16:55:15 +01: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

Randomize emoji filename (#10090)

2019-02-22 16:52:04 +01:00

dashboard_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-07-19 18:26:49 +02:00

domain_blocks_controller.rb

Change domain blocks to automatically support subdomains (#11138)

2019-06-22 00:13:10 +02:00

email_domain_blocks_controller.rb

Add logging of admin actions (#5757)

2017-11-24 02:05:53 +01:00

followers_controller.rb

Fix list of local followers showing remote followers in admin UI (#9700)

2019-01-03 06:40:16 +01:00

instances_controller.rb

Change domain blocks to automatically support subdomains (#11138)

2019-06-22 00:13:10 +02:00

invites_controller.rb

Add admin function to deactivate all invites (#8279)

2018-08-19 00:58:53 +02:00

pending_accounts_controller.rb

Add invite request to pending account notification e-mail (#10528)

2019-04-10 00:36:01 +02:00

relays_controller.rb

Add federation relay support (#7998)

2018-07-13 02:16:06 +02:00

report_notes_controller.rb

Feature: Improve reports ui (#7032)

2018-04-10 20:27:59 +02:00

reported_statuses_controller.rb

Do not error out when performing admin actions on no statuses (#10094)

2019-02-21 19:36:48 +01:00

reports_controller.rb

Add moderation warnings (#9519)

2018-12-22 20:02:09 +01:00

resets_controller.rb

Move #set_user to Admin::BaseController (#9470)

2018-12-17 11:40:51 +01:00

roles_controller.rb

Move #set_user to Admin::BaseController (#9470)

2018-12-17 11:40:51 +01:00

settings_controller.rb

Add validations to admin settings (#10348)

2019-03-23 14:07:04 +01:00

statuses_controller.rb

Add quick links to the admin interface in the WebUI (#8545)

2019-01-04 13:10:43 +01:00

subscriptions_controller.rb

Add moderator role and add pundit policies for admin actions (#5635)

2017-11-11 20:23:33 +01:00

tags_controller.rb

Fix Admin::TagsController#unhide (#9481)

2018-12-10 21:37:38 +01:00

two_factor_authentications_controller.rb

Move #set_user to Admin::BaseController (#9470)

2018-12-17 11:40:51 +01:00

warning_presets_controller.rb

Add moderation warnings (#9519)

2018-12-22 20:02:09 +01:00