mastodon - Plural Café fork of Mastodon/Glitch Social

Age	Commit message (Collapse)	Author
2020-01-04	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system.
2019-12-30	Fix settings pages being cacheable by the browser (#12714)	Eugen Rochko
	Fix #12255
2018-09-11	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both.
2018-09-09	Add force_login option to OAuth authorize page (#8655)	Eugen Rochko
	* 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
2017-12-11	change pack to 'auth'	cwm

2017-12-11	load pack	cwm

2017-04-08	Fix #1165 - before_action was called before protect_from_forgery	Eugen Rochko

2017-04-07	Allow setting of default language through config	Eugen Rochko
	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-04	Only call regeneration worker after first login after a 14 day break	Eugen Rochko

2016-11-15	Fix rubocop issues, introduce usage of frozen literal to improve performance	Eugen Rochko

2016-10-23	Fix OAuth authorization redirect	Eugen Rochko

2016-10-22	Adding OAuth access scopes, fixing OAuth authorization UI, adding rate limiting	Eugen Rochko
	to the API