mastodon

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	01eaeab56d	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system.	2020-01-04 23:04:42 +01:00
Eugen Rochko	6e9e8d89fa	Fix settings pages being cacheable by the browser (#12714 ) Fix #12255	2019-12-30 04:38:30 +01:00
Thibaut Girka	cd99255698	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both.	2018-09-11 16:51:26 +02:00
Eugen Rochko	2288d50a7b	Add force_login option to OAuth authorize page (#8655 ) * Add force_login option to OAuth authorize page For when a user needs to sign into an app from multiple accounts on the same server * When logging out from modal header, redirect back after re-login	2018-09-09 04:10:44 +02:00
cwm	0a52e37648	change pack to 'auth'	2017-12-11 18:14:41 -06:00
cwm	44992df257	load pack	2017-12-11 17:54:40 -06:00
Eugen Rochko	4b621188ad	Fix #1165 - before_action was called before protect_from_forgery	2017-04-08 02:30:50 +02:00
Eugen Rochko	e3a3422a65	Allow setting of default language through config Setting of locale in controller extracted to Localized concern, the doorkeeper authorized applications controller moved under custom namespace with inclusion of Localized, which resolves the "it sometimes appears in a different random language" bug	2017-04-07 12:40:26 +02:00
Eugen Rochko	b510a56c0c	Only call regeneration worker after first login after a 14 day break	2017-04-04 02:00:10 +02:00
Eugen Rochko	fdc17bea58	Fix rubocop issues, introduce usage of frozen literal to improve performance	2016-11-15 16:56:29 +01:00
Eugen Rochko	b746a931a5	Fix OAuth authorization redirect	2016-10-23 12:05:55 +02:00
Eugen Rochko	a9e40a3d80	Adding OAuth access scopes, fixing OAuth authorization UI, adding rate limiting to the API	2016-10-22 19:39:44 +02:00

12 Commits (c47be5bd864a1f5244f35122ba7fae31a149c73d)