me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/app/views/admin
History
Thibaut Girka 04204427d0 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/directories_controller.rb
- app/controllers/settings/applications_controller.rb
- app/controllers/settings/base_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/imports_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/sessions_controller.rb
- app/controllers/settings/two_factor_authentication/confirmations_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/controllers/settings/two_factor_authentications_controller.rb

Conflicts were due to some refactoring already made in glitch-soc
when introducing flavours.
2018-12-15 10:45:53 +01:00
..
account_moderation_notes Improve admin UI for accounts (#7360) 2018-05-05 23:06:29 +02:00
accounts Restore profile links in /admin/accounts (#9494) 2018-12-14 01:47:50 +01:00
action_logs Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
change_emails Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
custom_emojis Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
dashboard Add instance-wide setting to disable profile directory (#9497) 2018-12-11 19:18:29 +01:00
domain_blocks Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
email_domain_blocks Add option to block reports from domain (#8830) 2018-10-20 08:02:44 +02:00
instances Add option to block reports from domain (#8830) 2018-10-20 08:02:44 +02:00
invites Add admin function to deactivate all invites (#8279) 2018-08-19 00:58:53 +02:00
relays Display pending message on admin relays UI (#8494) 2018-08-28 05:39:43 +02:00
report_notes Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
reports Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2018-12-15 10:45:53 +01:00
statuses Allow to show a specific status in the admin interface 2018-09-03 18:19:11 +02:00
subscriptions Scrollable tables in settings pages (#4857) 2017-09-09 02:26:58 +02:00
suspensions Better singulars of account followers/toots. (#8471) 2018-08-26 21:30:53 +02:00
tags Add profile directory (#9427) 2018-12-06 17:36:11 +01:00