9 Commits (07592234ac1e2ce9de5c6096df1f2b71e1d34703)

Author	SHA1	Message	Date
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.	6 years ago
ysksn	8996de49df	Create Settings::BaseController (#9507) ... Define `Settings::BaseController#set_body_classes` so that sub classes inherit `Settings::BaseController` don't need to define `#set_body_classes` agein.	6 years ago
Yamagishi Kazutoshi	cad03e69b3	Set @body_classes to admin layout (#9081)	6 years ago
Thibaut Girka	28ccf0a464	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	fd007264dc	Enforce order on authorized applications page (#7587) ... Fix #7586	6 years ago
kibigo!	8aeda4f064	Finalized theme loading and stuff	7 years ago
nullkal	da85aff49c	Use checkboxes for application scope setting (#4671)	7 years ago
Eugen Rochko	b13501268f	Fix up the applications area (#4664) ... - Section it into "Development" area - Improve UI of application form, index, and details	7 years ago
Colin Mitchell	63b98318c5	Application prefs section (#2758) ... * Add code for creating/managing apps to settings section * Add specs for app changes * Fix controller spec * Fix view file I pasted over by mistake * Add locale strings. Add 'my apps' to nav * Add Client ID/Secret to App page. Add some visual separation * Fix rubocop warnings * Fix embarrassing typo I lost an `end` statement while fixing a merge conflict. * Add code for creating/managing apps to settings section - Add specs for app changes - Add locale strings. Add 'my apps' to nav - Add Client ID/Secret to App page. Add some visual separation - Fix some bugs/warnings * Update to match code standards * Trigger notification * Add warning about not sharing API secrets * Tweak spec a bit * Cleanup fixture creation by using let! * Remove unused key * Add foreign key for application<->user	7 years ago