mastodon

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	e7f1bfdc2d	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.	2018-12-09 16:08:04 +01:00
Eugen Rochko	73be8f38c1	Add profile directory (#9427 ) Fix #5578	2018-12-06 17:36:11 +01:00
Yamagishi Kazutoshi	e8ffecbd36	Set @body_classes to admin layout (#9081 )	2018-10-25 00:10:01 +02:00
Jenkins	2636a23092	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-05-17 11:17:21 +00:00
Eugen Rochko	7293b9fc61	Ensure unfilled fields are shown when errors are shown (#7523 ) Fix #7486	2018-05-17 13:00:56 +02:00
Thibaut Girka	1c9c0167b7	Merge branch 'master' into glitch-soc/master Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	2018-05-10 00:03:28 +02:00
Eugen Rochko	42cd363542	Bot nameplates (#7391 ) * Store actor type in database * Add bot nameplate to web UI, add setting to preferences, API, AP Fix #7365 * Fix code style issues	2018-05-07 09:31:07 +02:00
David Yip	813da6788e	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: db/schema.rb	2018-04-14 09:12:50 -05:00
Eugen Rochko	78ed4ab75f	Add bio fields (#6645 ) * Add bio fields - Fix #3211 - Fix #232 - Fix #121 * Display bio fields in web UI * Fix output of links and missing fields * Federate bio fields over ActivityPub as PropertyValue * Improve how the fields are stored, add to Edit profile form * Add rel=me to links in fields Fix #121	2018-04-14 12:41:08 +02:00
kibigo!	bdbbd06dad	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
masarakki	649a20ab46	authorize-follow-requests-after-unlocking (#4658 )	2017-08-26 12:40:03 +02:00
Eugen Rochko	b7370ac8ba	ActivityPub delivery (#4566 ) * Deliver ActivityPub Like * Deliver ActivityPub Undo-Like * Deliver ActivityPub Create/Announce activities * Deliver ActivityPub creates from mentions * Deliver ActivityPub Block/Undo-Block * Deliver ActivityPub Accept/Reject-Follow * Deliver ActivityPub Undo-Follow * Deliver ActivityPub Follow * Deliver ActivityPub Delete activities Incidentally fix #889 * Adjust BatchedRemoveStatusService for ActivityPub * Add tests for ActivityPub workers * Add tests for FollowService * Add tests for FavouriteService, UnfollowService and PostStatusService * Add tests for ReblogService, BlockService, UnblockService, ProcessMentionsService * Add tests for AuthorizeFollowService, RejectFollowService, RemoveStatusService * Add tests for BatchedRemoveStatusService * Deliver updates to a local account to ActivityPub followers * Minor adjustments	2017-08-13 00:44:41 +02:00
Matt Jankowski	a8e1afc30a	Simplify render in controllers (#2144 )	2017-04-19 15:37:42 +02:00
Eugen Rochko	f4bc9620a9	Update settings to re-use admin layout, one big navigation tree, improve settings forms	2017-01-28 03:56:10 +01:00
Eugen Rochko	2d2154ba75	Add "locked" flag to accounts, prevent blocked users from following, force-unfollow blocked users	2016-12-22 21:34:19 +01:00
Eugen Rochko	f406e01fcf	Add filters for suspended accounts	2016-12-06 18:03:30 +01:00
Eugen Rochko	14bd46946d	Per-status control for unlisted mode, also federation for unlisted mode Fix #233, fix #268	2016-11-30 21:34:59 +01:00
Alyssa Ross	cefef2c571	Extract filename obfuscation into module	2016-11-24 00:30:58 +00:00
Andrea Faulds	7161f91313	Rename media to avoid exposing filename (fixes #207 )	2016-11-23 21:03:03 +00:00
Eugen Rochko	1788164352	Local accounts can control "silenced" attribute which removes them from public timeline	2016-11-21 23:06:41 +01:00
Eugen Rochko	3ce6ac0ce2	Adding some localizations	2016-11-15 23:02:57 +01: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	7a6d95f70c	E-mail preferences page	2016-10-14 02:28:49 +02:00

23 Commits (fb0c906c717f2b21bb63610742a357850142b522)