348 Commits (835eec8a4cbf8fa340241fc0bd83e07e8c19ef5d)

Author	SHA1	Message	Date
Jenkins	f839ac694c	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	dbda87c31f	Revert #5772 (#6221)	8 years ago
Jenkins	722b3f567f	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	e4a241abef	Fix bad URL schemes being accepted (#6219) ... * Fix actors accepting invalid URI schemes or different host between URI and URL * Fix statuses accepting invalid URI scheme or different host to actor * Adjust tests to new requirements * Improve readability of mismatching_origin?/invalid_origin? methods	8 years ago
puckipedia	0eff42d688	Move Article from supported to converted types (#6218)	8 years ago
Jenkins	fc884d015a	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
ThibG	a8b51124ba	Don't normalize URLs in toots (#6134) ... * Don't normalize URLs in toots URL normalization is ill-defined and may cause certain links to break. * Change specs since we are not normalizing user-provided URLs	8 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	8 years ago
Jenkins	933840bebf	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
puckipedia	545095b3ce	[!] Sanitize incoming classlist properly (#6162) ... * Sanitize classlist properly * Actually properly sanitize every class after the first * Improve Formatter spec to check for multiple classes and non-space whitespace	8 years ago
Eugen Rochko	d60fd87e01	Don't leave behind husk of remotely-deleted profile (#6159) ... There's no reason for an Account record to persist after Delete->Actor is received. SuspendAccountService is necessary to make sure deleted toots get sent over streaming API properly and home feeds get cleaned up. By removing Account record, we can ensure that if in the future the account is restored remotely (or username reused), it can start with a clean slate.	8 years ago
Eugen Rochko	1419f656e2	Fix stats expiring too quickly because of variable mistake (#6155)	8 years ago
David Yip	4cca1d1e7e	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/auth/confirmations_controller.rb	8 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	8 years ago
David Yip	7174d1c955	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/images/mastodon-drawer.png app/javascript/styles/mastodon/components.scss	8 years ago
Akihiko Odaki	e0ef7f9d79	Fix XML oEmbed support discovery (#6104)	8 years ago
Jenkins	37254c4f5d	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	3d3b403359	Do not hide statuses from silenced accounts from other silenced accounts (#6030)	8 years ago
Jenkins	82236a3703	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	a8deb6648b	Fix redundant HTTP request in FetchLinkCardService (#6002)	8 years ago
David Yip	a057ed5cfe	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	8 years ago
kibigo!	bdca1614d5	Screenshot support for themes	8 years ago
cwm	072ab191cc	pulled master, moved locale entry to new location	8 years ago
kibigo!	b28cd6769c	Javascript intl8n flavour support	8 years ago
abcang	3caec1ecc2	Save media outside transaction (#5959)	8 years ago
cwm	7284e36fbd	fixed fav setting change	8 years ago
cwm	a489e5d5cd	added a few more things	8 years ago
beatrix	81b0145759	Merge pull request #229 from glitch-soc/glitch-theme ... Advanced Next-Level Flavours And Skins For Mastodon™	8 years ago
Jenkins	8ca91cef45	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Yamagishi Kazutoshi	b21db9bbde	Using double splat operator (#5859)	8 years ago
kibigo!	5bed0f10ed	Various fixes	8 years ago
David Yip	d9800a5647	Merge branch 'gs-master' into glitch-theme	8 years ago
kibigo!	bc4fa6b198	Rename themes -> flavours ? ?	8 years ago
kibigo!	d216547382	Fixed typos	8 years ago
kibigo!	541fe9b110	Skins support	8 years ago
Jenkins	ad46bc9772	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	4c6b5dbe96	Add semi-support for Video/Image objects in ActivityPub (#5848) ... * Add semi-support for Video/Image objects in ActivityPub Video and Image objects will create corresponding status records with manually crafted text contents (title + URL) * Extract html-url-finding logic into JsonLdHelper * Fallback to id when url missing, extract supported object types	8 years ago
Eugen Rochko	85e97ecab6	Fix too many forwards (#5854) ... * Avoid sending explicit Undo->Announce when original deleted * Do not forward a reply back to the server that sent it * Deduplicate inboxes of rebloggers' followers for delete forwarding * Adjust test * Fix wrong class, bad SQL, wrong variable, outdated comment	8 years ago
David Yip	95c270f5b1	Merge remote-tracking branch 'origin/master' into gs-master	8 years ago
aschmitz	eeaec39888	Allow hiding of reblogs from followed users (#5762) ... * Allow hiding of reblogs from followed users This adds a new entry to the account menu to allow users to hide future reblogs from a user (and then if they've done that, to show future reblogs instead). This does not remove or add historical reblogs from/to the user's timeline; it only affects new statuses. The API for this operates by sending a "reblogs" key to the follow endpoint. If this is sent when starting a new follow, it will be respected from the beginning of the follow relationship (even if the follow request must be approved by the followee). If this is sent when a follow relationship already exists, it will simply update the existing follow relationship. As with the notification muting, this will now return an object ({reblogs: [true|false]}) or false for each follow relationship when requesting relationship information for an account. This should cause few issues due to an object being truthy in many languages, but some modifications may need to be made in pickier languages. Database changes: adds a show_reblogs column (default true, non-nullable) to the follows and follow_requests tables. Because these are non-nullable, we use the existing MigrationHelpers to perform this change without locking those tables, although the tables are likely to be small anyway. Tests included. See also <https://github.com/glitch-soc/mastodon/pull/212>. * Rubocop fixes * Code review changes * Test fixes This patchset closes #648 and resolves #3271. * Rubocop fix * Revert reblogs defaulting in argument, fix tests It turns out we needed this for the same reason we needed it in muting: if nil gets passed in somehow (most usually by an API client not passing any value), we need to detect and handle it. We could specify a default in the parameter and then also catch nil, but there's no great reason to duplicate the default value.	8 years ago
kibigo!	bdbbd06dad	Finalized theme loading and stuff	8 years ago
David Yip	d083f7741a	Merge remote-tracking branch 'tootsuite/master'	8 years ago
Eugen Rochko	58cede4808	Profile redirect notes (#5746) ... * Serialize moved accounts into REST and ActivityPub APIs * Parse federated moved accounts from ActivityPub * Add note about moved accounts to public profiles * Add moved account message to web UI * Fix code style issues	8 years ago
beatrix	dec960c828	Merge pull request #208 from yipdw/keyword-mute ... Run keyword mutes on hashtags	8 years ago
David Yip	1ab12ba38e	Merge remote-tracking branch 'origin/master' into merge-upstream	8 years ago
Eugen Rochko	24cafd73a2	Lists (#5703) ... * Add structure for lists * Add list timeline streaming API * Add list APIs, bind list-account relation to follow relation * Add API for adding/removing accounts from lists * Add pagination to lists API * Add pagination to list accounts API * Adjust scopes for new APIs - Creating and modifying lists merely requires "write" scope - Fetching information about lists merely requires "read" scope * Add test for wrong user context on list timeline * Clean up tests	8 years ago
kibigo!	585758a373	Themed prefetching	8 years ago
David Yip	b28b405b97	Merge remote-tracking branch 'origin/master' into gs-master	8 years ago
Eugen Rochko	3e90987c8b	Fix some rubocop style issues (#5730)	8 years ago
Renato "Lond" Cerqueira	ad207456d6	Improve language filter (#5724) ... * Scrub text of html before detecting language. * Detect language on statuses coming from activitypub. * Fix rubocop comments. * Remove custom emoji from text before language detection	8 years ago