mastodon

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	65e994b29b	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
ysksn	b048926e67	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.	2018-12-12 22:32:13 +01:00
Yamagishi Kazutoshi	e8ffecbd36	Set @body_classes to admin layout (#9081 )	2018-10-25 00:10:01 +02:00
Thibaut Girka	e0ef89c73f	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-23 16:05:19 +02:00
Eugen Rochko	36e47a31e3	Enforce order on authorized applications page (#7587 ) Fix #7586	2018-05-22 14:44:53 +02:00
kibigo!	bdbbd06dad	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
nullkal	80393a23d0	Use checkboxes for application scope setting (#4671 )	2017-08-23 15:16:20 +02:00
Eugen Rochko	c1b086a538	Fix up the applications area (#4664 ) - Section it into "Development" area - Improve UI of application form, index, and details	2017-08-23 00:59:35 +02:00
Colin Mitchell	871c0d251a	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	2017-08-22 18:33:57 +02:00

9 Commits (4fbce23992c48314f581e07804360a5e14f915b8)