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

Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb

Moved public.js changes to settings.js.

2018-12-09 16:08:04 +01:00

..

account_moderation_notes_controller.rb

Add logging of admin actions (#5757)

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

accounts_controller.rb

Redesign admin accounts index (#9340)

2018-11-26 15:53:27 +01: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-10-26 20:41:43 +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

Add resend confirmation for admin (#7378)

2018-05-06 10:59:03 +02:00

custom_emojis_controller.rb

keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)

2017-12-30 02:43:43 +01:00

dashboard_controller.rb

Display trending hashtags on admin dashboard (#8038)

2018-07-16 19:21:27 +02:00

domain_blocks_controller.rb

Add option to block reports from domain (#8830)

2018-10-20 08:02:44 +02:00

email_domain_blocks_controller.rb

Add logging of admin actions (#5757)

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

instances_controller.rb

Extract counters from accounts table to account_stats table (#9295)

2018-11-19 00:43:52 +01:00

invites_controller.rb

Add admin function to deactivate all invites (#8279)

2018-08-19 00:58:53 +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

Improve admin UI for accounts (#7360)

2018-05-05 23:06:29 +02:00

reports_controller.rb

Add "disable" button to report screen (#9024)

2018-10-20 02:39:39 +02:00

resets_controller.rb

Add logging of admin actions (#5757)

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

roles_controller.rb

Add logging of admin actions (#5757)

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

settings_controller.rb

Allow selecting both default flavour and theme

2018-10-12 19:06:35 +02:00

silences_controller.rb

Add logging of admin actions (#5757)

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

statuses_controller.rb

Allow to show a specific status in the admin interface

2018-09-03 18:19:11 +02:00

subscriptions_controller.rb

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

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

suspensions_controller.rb

Fix regression when suspending not from report (#8400)

2018-08-23 21:51:56 +02:00

tags_controller.rb

Add profile directory (#9427)

2018-12-06 17:36:11 +01:00

two_factor_authentications_controller.rb

Add logging of admin actions (#5757)

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