635 Commits (4c1fd9a19c779fa6e7d74513c61f37ce05a841b3)

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
Jenkins	0e10667fbe	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	1cc44cba81	Fix #6331 (#6341) ... UserTrackingConcern is circumvented by SessionsController#create because it calls warden, which calls the User#update_tracked_fields! method directly. Move returning user logic to that method.	7 years ago
Akihiko Odaki	613e7c7521	Rename ResolveRemoteAccountService to ResolveAccountService (#6327) ... The service used to be named ResolveRemoteAccountService resolves local accounts as well.	7 years ago
David Yip	2ca965c704	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss	7 years ago
Yamagishi Kazutoshi	238de58e65	Change belongs_to_required_by_default to true (#5888)	7 years ago
Eugen Rochko	d799921c75	Replace tutorial modal with welcome e-mail (#6273) ... * Remove onboarding modal * Welcome e-mail * Send welcome e-mail after confirmation * Remove obsolete translations	7 years ago
Jenkins	0c7dc6c781	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	ed867eca9d	Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252)	7 years ago
Jenkins	f839ac694c	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	dbda87c31f	Revert #5772 (#6221)	7 years ago
Jenkins	c69a23ae46	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Patrick Figel	5ec25ff3e1	Fix email confirmation link not updating email (#6187) ... A change introduced in #6125 prevents `Devise::Models::Confirmable#confirm` from being called for existing users, which in turn leads to `email` not being set to `unconfirmed_email`, breaking email updates. This also adds a test that would've caught this issue.	7 years ago
Jenkins	fc884d015a	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Akihiko Odaki	161c72d66d	Allow to dereference Follow object for ActivityPub (#5772) ... * Allow to dereference Follow object for ActivityPub * Accept IRI as object representation for Accept activity	7 years ago
Jenkins	933840bebf	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Patrick Figel	04ecf44c2f	Add confirmation step for email changes (#6071) ... * Add confirmation step for email changes This adds a confirmation step for email changes of existing users. Like the initial account confirmation, a confirmation link is sent to the new address. Additionally, a notification is sent to the existing address when the change is initiated. This message includes instruction to reset the password immediately or to contact the instance admin if the change was not initiated by the account owner. Fixes #3871 * Add review fixes	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
David Yip	82b2e224a2	Merge branch 'gs-master' into prevent-local-only-federation ... Conflicts: db/schema.rb	7 years ago
David Yip	e35a350119	Examples for Status#set_locality and .as_tag_timeline. ... This commit also: - exposes the local-only emoji so that it can be used in examples - allows local_only to be set explicitly, i.e. for timeline filtering specs	7 years ago
Jenkins	82236a3703	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	ad75ec8b5b	Add filters to admin UI for custom emojis (#6003)	7 years ago
Eugen Rochko	20a6584d2d	Clean up admin UI for accounts (#6004) ... * Add staff filter to admin UI for accounts, remove obsolete columns * Only display OStatus section in admin UI for accounts when OStatus data	7 years ago
David Yip	a057ed5cfe	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	7 years ago
Akihiko Odaki	14c4a33cd9	Change account_id non-nullable in lists (#5979)	7 years ago
Eugen Rochko	481fac7c84	Exclude moved accounts from search results (#5984)	7 years ago
Erin	c5a4eda694	move outbox filtering to Status#permitted_for (as per @ekiru)	7 years ago
Erin	288f1293ef	set local_only in a before_create callback instead of status service	7 years ago
Erin	0c46058a43	remove vestigial Status#local_only? definition	7 years ago
Erin	24f36ca912	Status#not_local_only scope should match nils too	7 years ago
Erin	6bd18e43ba	filter local-only statuses from public pages	7 years ago
Erin	08519cd4f4	status: stub local_only?, add scope, add marked_local_only?	7 years ago
Erin	434c70fd98	add a local_only column to the statuses table	7 years ago
Andrea Scarpino	6a82939adb	Fix account and tag searches with leading/trailing spaces (#5965) ... * Strip leading & trailing spaces from account query * Strip leading & trailing spaces from tag search	7 years ago
cwm	abe95b614b	add initial components based off of tootsuite pr #1507	7 years ago
Eugen Rochko	2f4c5f504f	Limit users to 50 lists, remove pagination from lists API (#5933)	7 years ago
Eugen Rochko	c36b9cc5a6	Ensure link thumbnails are not stretched to super low quality (#5932)	7 years ago
Jenkins	744447b3c0	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Yamagishi Kazutoshi	0c4ca3e549	Remove duplicate annotate (#5910) ... * Remove duplicate annotate * Remove blank line	7 years ago
Akihiko Odaki	c083816c24	Add embed_url to preview cards (#5775)	7 years ago
beatrix	81b0145759	Merge pull request #229 from glitch-soc/glitch-theme ... Advanced Next-Level Flavours And Skins For Mastodon™	7 years ago
Jenkins	8ca91cef45	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Yamagishi Kazutoshi	b21db9bbde	Using double splat operator (#5859)	7 years ago
Eugen Rochko	42bcbd36b7	Remove rabl dependency (#5894) ... * Remove rabl dependency * Replicate old Oj configuration	7 years ago
Eugen Rochko	d68868ca14	Lists redis clean-up (#5886) ... * When list is deleted, remove feed from redis * Clean up list feeds of inactive users	7 years ago
Eugen Rochko	e20895f251	Add list of lists component to web UI (#5811) ... * Add list of lists component to web UI * Add list adding * Add list removing * List editor modal * Add API account search limited by following=true relation * Rework list editor modal * Remove mandatory pagination of GET /api/v1/lists/:id/accounts * Adjust search input placeholder * Fix rspec (#5890) * i18n: (zh-CN) Add missing translations for #5811 (#5891) * i18n: (zh-CN) yarn manage:translations -- zh-CN * i18n: (zh-CN) Add missing translations for #5811 * Fix some issues - Display loading/missing state for list timelines - Order lists alphabetically in overview - Fix async list editor reset - Redirect to /lists after deleting unpinned list - Redirect to / after pinning a list * Remove dead list columns when a list is deleted or fetch returns 404	7 years ago
David Yip	d9800a5647	Merge branch 'gs-master' into glitch-theme	7 years ago
kibigo!	bc4fa6b198	Rename themes -> flavours ? ?	7 years ago