78 Commits (a6fb1c58eead1357a307813c69f798f32bcf7cae)

Author	SHA1	Message	Date
David Yip	4c1fd9a19c	Merge remote-tracking branch 'tootsuite/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss	7 years ago
Alexander	04fef7b888	pam authentication (#5303) ... * add pam support, without extra column * bugfixes for pam login * document options * fix code style * fix codestyle * fix tests * don't call remember_me without password * fix codestyle * improve checks for pam usage (should fix tests) * fix remember_me part 1 * add remember_token column because :rememberable requires either a password or this column. * migrate db for remember_token * move pam_authentication to the right place, fix logic bug in edit.html.haml * fix tests * fix pam authentication, improve username lookup, add comment * valid? is sometimes not honored, return nil instead trying to authenticate with pam * update devise_pam_authenticatable2 and adjust code. Fixes sideeffects observed in tests * update devise_pam_authenticatable gem, fixes for codeconventions, fix finding user * codeconvention fixes * code convention fixes * fix idention * update dependency, explicit conflict check * fix disabled password updates if in pam mode * fix check password if password is present, fix templates * block registration if account is maintained by pam * Revert "block registration if account is maintained by pam" This reverts commit 8e7a083d650240b6fac414926744b4b90b435f20. * fix identation error introduced by rebase * block usernames maintained by pam * document pam settings better * fix code style	7 years ago
David Yip	f7c4d4464b	Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master	7 years ago
David Yip	70c99a9f34	Use error pack when rendering error pages. Fixes #305.	7 years ago
Jenkins	c2e1bfd9ae	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Yamagishi Kazutoshi	1d92b90be9	Fix force_ssl conditional (#6201)	7 years ago
Yamagishi Kazutoshi	da809f9eec	Fix unintended cache (#6214)	7 years ago
David Yip	5083311d64	Merge remote-tracking branch 'ykzts/fix-unintended-cache' into gs-master	7 years ago
Yamagishi Kazutoshi	2af307bce4	Fix unintended cache	7 years ago
Jenkins	c69a23ae46	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
ThibG	3bee0996c5	Make sure private toots remain private and do not end up in HTTP caches (#6175)	7 years ago
Eugen Rochko	c10f4bdb03	Cache JSON of immutable ActivityPub representations (#6171)	7 years ago
David Yip	4cca1d1e7e	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/auth/confirmations_controller.rb	7 years ago
Eugen Rochko	38fc1b498d	Add more instance stats APIs (#6125) ... * Add GET /api/v1/instance/peers API to reveal known domains * Add GET /api/v1/instance/activity API * Make new APIs disableable, exclude private statuses from activity stats * Fix code style issue * Fix week timestamps	7 years ago
kibigo!	b28cd6769c	Javascript intl8n flavour support	7 years ago
kibigo!	717b7d555c	Skins shouldn't apply to fallback flavours	7 years ago
kibigo!	061211a1e3	Fix common packs when other pack also there	7 years ago
kibigo!	bc4fa6b198	Rename themes -> flavours ? ?	7 years ago
kibigo!	541fe9b110	Skins support	8 years ago
kibigo!	bdbbd06dad	Finalized theme loading and stuff	8 years ago
kibigo!	585758a373	Themed prefetching	8 years ago
Eugen Rochko	3e90987c8b	Fix some rubocop style issues (#5730)	8 years ago
Eugen Rochko	7bb8b0b2fc	Add moderator role and add pundit policies for admin actions (#5635) ... * Add moderator role and add pundit policies for admin actions * Add rake task for turning user into mod and revoking it again * Fix handling of unauthorized exception * Deliver new report e-mails to staff, not just admins * Add promote/demote to admin UI, hide some actions conditionally * Fix unused i18n	8 years ago
Andrew	0401a24558	Add support for multiple themes (#4959) ... * Add support for selecting a theme * Fix codeclimate issues * Look up site default style if current user is not available due to e.g. not being logged in * Remove outdated comment in common.js * Address requested changes in themes PR * Fix codeclimate issues * Explicitly check current_account in application controller and only check theme availability if non-nil * codeclimate * explicit precedence with && * Fix code style in application_controller according to @nightpool's suggestion, use default style in embedded.html.haml * codeclimate: indentation + return	8 years ago
Eugen Rochko	df605f0f8b	Add "signed in as" header to some pages (#4523)	8 years ago
Eugen Rochko	00df69bc89	Fix #4058 - Use a long-lived cookie to keep track of user-level sessions (#4091) ... * Fix #4058 - Use a long-lived cookie to keep track of user-level sessions * Fix tests, smooth migrate from previous session-based identifier	8 years ago
Eugen Rochko	ed7dc1704d	Bind web UI access tokens to sessions (#3940) ... * Add overview of active sessions * Better display of browser/platform name * Improve how browser information is stored and displayed for sessions overview * Fix test * Fix #2347 - Bind web UI access token to session When you logout, session also destroys the access token, so it's no longer valid. If access token is destroyed some other way, the session is also destroyed, requiring a re-login. Fix #1681 - Add scheduler to remove revoked access tokens and grants * Fix test	8 years ago
Yamagishi Kazutoshi	676ba50601	Show error message to suspended user (#3281)	8 years ago
Yamagishi Kazutoshi	73e4468ff3	Change "Account.any?" to "Account.exists?" (#3217)	8 years ago
Akihiko Odaki	aa662cecad	single_user_mode? always returns boolean (#3215) ... This change also adds a specification for the method.	8 years ago
Matt Jankowski	7bffd16024	Error responses cleanup (#2692) ... * Use respond_with_error for forbidden errors * Wrap up common error code into single method	8 years ago
Matt Jankowski	fdcf884cf7	Extract user tracking into concern (#2600)	8 years ago
alpaca-tc	9317ec8eb1	Localize with i18n for Devise::FailureApp (#2309) ... This PR fixes I18n.locale for rake middlewares. Mastodon uses Devise that depends on Warden. Warden::Manager can be found in rake middleware. It is outside of the controller. In the case of authentication failed, warden calls throw(:warden). At the time Warden::Manager delegates request to failure_app to generate response and flash[:alert] after catching it. Unfortunately, I18n.locale is already reset then because I18n.with_locale is enabled only inside the controller. If we used I18n.locale=, Devise::FailureApp could get the current locale.	8 years ago
Matt Jankowski	a0dd90a397	Return force_ssl to the controller (#2380)	8 years ago
Evan Minto	66fd8e7821	ActivityPub: Add basic, read-only support for Outboxes, Notes, and Create/Announce Activities (#2197) ... * Clean up collapsible components * Expose user Outboxes and AS2 representations of statuses * Save work thus far. * Fix bad merge. * Save my work * Clean up pagination. * First test working. * Add tests. * Add Forbidden error template. * Revert yarn.lock changes. * Fix code style deviations and use localized instead of hardcoded English text.	8 years ago
Matt Jankowski	ee82d8a876	Move force_ssl check to production config (#2165) ... The force_ssl method from controllers does not add all of the options that the sitewide configuration in a config block does. For example, HSTS enforcement is not added by the controller method, but is added by this style.	8 years ago
Takayoshi Nishida	5e33ad29d4	Fix #2195 - Set locale to error pages (#2255) ... * Fix #2195 - Set locale to error pages * Fix #2195 - Cut duplicate process into one method	8 years ago
Eugen	5d710b1139	Make file attachment on MediaAttachment optional (#1865) ... Create MediaAttachment but without actual file download when domain is blocked with reject_media set to true Clean up old media files when creating a new domain block with reject_media set to true Return remote_url in media attachments API if local file is not present Undo domain block action in admin UI Ability to enable reject_media from admin UI	8 years ago
Marcin Cieślak	1c8477eab2	Give SINGLE_USER a chance to register (#1820) ... An attempt to open a brand new Mastodon instance configured as SINGLE_USER_MODE=true will cause an exception. Enable temporary registration if we have no users in the database Fixes #1817	8 years ago
Eugen Rochko	4b621188ad	Fix #1165 - before_action was called before protect_from_forgery	8 years ago
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	8 years ago
Eugen Rochko	b510a56c0c	Only call regeneration worker after first login after a 14 day break	8 years ago
Eugen Rochko	2d07cb5771	Catching rack timeout from rails doesn't work	8 years ago
Eugen Rochko	5b12624847	Add proper error page for request timeouts	8 years ago
Eugen Rochko	08b96f1b9f	Fix wrong HTTP status codes on error pages	8 years ago
Eugen Rochko	e22a56183a	Improve error page layouting. 500 page has to stay static because it's ... used from nginx when Rails fails.	8 years ago
Effy Elden	ed41f9f0b1	Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether	8 years ago
Eugen Rochko	3282448878	Fix #86 - resolve layout breaking on zoom-out on accounts grid	8 years ago
Eugen Rochko	f406e01fcf	Add filters for suspended accounts	9 years ago
Eugen Rochko	816284d739	Fix #248 - Reload all accounts when fetching from cache	9 years ago