mastodon

Commit Graph

Author	SHA1	Message	Date
David Yip	b28b405b97	Merge remote-tracking branch 'origin/master' into gs-master	8 years ago
ysksn	9dd5e329ab	Remove empty strings (#5732 )	8 years ago
Surinna Curtis	35fbdc36f9	Merge tootsuite/master at `3023725936`	8 years ago
Surinna Curtis	031a5a8f92	Optional notification muting (#5087 ) * Add a hide_notifications column to mutes * Add muting_notifications? and a notifications argument to mute! * block notifications in notify_service from hard muted accounts * Add specs for how mute! interacts with muting_notifications? * specs testing that hide_notifications in mutes actually hides notifications * Add support for muting notifications in MuteService * API support for muting notifications (and specs) * Less gross passing of notifications flag * Break out a separate mute modal with a hide-notifications checkbox. * Convert profile header mute to use mute modal * Satisfy eslint. * specs for MuteService notifications params * add trailing newlines to files for Pork :) * Put the label for the hide notifications checkbox in a label element. * Add a /api/v1/mutes/details route that just returns the array of mutes. * Define a serializer for /api/v1/mutes/details * Add more specs for the /api/v1/mutes/details endpoint * Expose whether a mute hides notifications in the api/v1/relationships endpoint * Show whether muted users' notifications are muted in account lists * Allow modifying the hide_notifications of a mute with the /api/v1/accounts/:id/mute endpoint * make the hide/unhide notifications buttons work * satisfy eslint * In probably dead code, replace a dispatch of muteAccount that was skipping the modal with launching the mute modal. * fix a missing import * add an explanatory comment to AccountInteractions * Refactor handling of default params for muting to make code cleaner * minor code style fixes oops * Fixed a typo that was breaking the account mute API endpoint * Apply white-space: nowrap to account relationships icons * Fix code style issues * Remove superfluous blank line * Rename /api/v1/mutes/details -> /api/v2/mutes * Don't serialize "account" in MuteSerializer Doing so is somewhat unnecessary since it's always the current user's account. * Fix wrong variable name in api/v2/mutes * Use Toggle in place of checkbox in the mute modal. * Make the Toggle in the mute modal look better * Code style changes in specs and removed an extra space * Code review suggestions from akihikodaki Also fixed a syntax error in tests for AccountInteractions. * Make AddHideNotificationsToMute Concurrent It's not clear how much this will benefit instances in practice, as the number of mutes tends to be pretty small, but this should prevent any blocking migrations nonetheless. * Fix up migration things * Remove /api/v2/mutes	8 years ago
aschmitz	b95c48748c	Per-user reblog hiding implementation/fixes/tests Note that this will only hide/show future reblogs by a user, and does nothing to remove/add reblogs that are already in the timeline. I don't think that's a particularly confusing behavior, and it's a lot easier to implement (similar to mutes, I believe).	8 years ago
Nanamachi	d200e041fe	Rewrite account_controller_spec (#5633 ) * make accounts_controller_spec DRY * Add blocked user spec	8 years ago
David Yip	4fa2f7e82d	Set up /settings/keyword_mutes. #164 . This should eventually be accessible via the API and the web frontend, but I find it easier to set up an editing interface using Rails templates and the like. We can always take it out if it turns out we don't need it.	8 years ago
David Yip	6cd5b3bbe5	Merge remote-tracking branch 'origin/master' into gs-master	8 years ago
Eugen Rochko	3283868e28	Improve spec of Feed and UserTrackingConcern (#5367 )	8 years ago
kibigo!	8d6b9ba494	Merge upstream 2.0ish #165	8 years ago
Akihiko Odaki	cc796298c9	Fix pagination in Api::V1::BlocksController (#5285 )	8 years ago
nullkal	633426b261	Add moderation note (#5240 ) * Add moderation note * Add frozen_string_literal * Make rspec pass	8 years ago
Eugen Rochko	f486ef2666	Redesign public hashtag pages (#5237 )	8 years ago
utam0k	b3af3f9f8c	Implement EmailBlackList (#5109 ) * Implement BlacklistedEmailDomain * Use Faker::Internet.domain_name * Remove note column * Add frozen_string_literal comment * Delete unnecessary codes * Sort alphabetically * Change of wording * Rename BlacklistedEmailDomain to EmailDomainBlock	8 years ago
Yamagishi Kazutoshi	178f718a9b	Separate notifications preferences from general preferences (#4447 ) * Separate notifications preferences from general preferences * Refine settings/notifications/show * remove preferences.notifications	8 years ago
ThibG	dfaa219f88	Fix HTTP responses for salmon and ActivityPub inbox processing (#5200 ) * Return sensible HTTP status for ActivityPub inbox processing * Return sensible HTTP status for salmon slap processing * Return additional information to debug signature verification failures	8 years ago
Eugen Rochko	47ecd652d3	Make Chrome splash screen same color as web UI's background color (#5169 )	8 years ago
Akihiko Odaki	cdacac8c6c	Fix order of paginated accounts in FollowerDomainsController and spec (#3357 ) * Fix order of paginated accounts in FollowerDomainsController Unordered pagination could result in unexpected behavior. * Cover Settings::FollowerDomainsController more	8 years ago
Eugen Rochko	eb605141ff	Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112 )	8 years ago
Eugen Rochko	4ec1771165	Add ability to specify alternative text for media attachments (#5123 ) * Fix #117 - Add ability to specify alternative text for media attachments - POST /api/v1/media accepts `description` straight away - PUT /api/v1/media/:id to update `description` (only for unattached ones) - Serialized as `name` of Document object in ActivityPub - Uploads form adjusted for better performance and description input * Add tests * Change undo button blend mode to difference	8 years ago
Ondřej Hruška	83bda6c1a8	Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream	8 years ago
Ondřej Hruška	9330ea1f4d	Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream	8 years ago
Eugen Rochko	293972f716	New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051 )	8 years ago
aschmitz	669fe9ee06	Change IDs to strings rather than numbers in API JSON output (#5019 ) * Fix JavaScript interface with long IDs Somewhat predictably, the JS interface handled IDs as numbers, which in JS are IEEE double-precision floats. This loses some precision when working with numbers as large as those generated by the new ID scheme, so we instead handle them here as strings. This is relatively simple, and doesn't appear to have caused any problems, but should definitely be tested more thoroughly than the built-in tests. Several days of use appear to support this working properly. BREAKING CHANGE: The major(!) change here is that IDs are now returned as strings by the REST endpoints, rather than as integers. In practice, relatively few changes were required to make the existing JS UI work with this change, but it will likely hit API clients pretty hard: it's an entirely different type to consume. (The one API client I tested, Tusky, handles this with no problems, however.) Twitter ran into this issue when introducing Snowflake IDs, and decided to instead introduce an `id_str` field in JSON responses. I have opted to not do that, and instead force all IDs to 64-bit integers represented by strings in one go. (I believe Twitter exacerbated their problem by rolling out the changes three times: once for statuses, once for DMs, and once for user IDs, as well as by leaving an integer ID value in JSON. As they said, "If you’re using the `id` field with JSON in a Javascript-related language, there is a very high likelihood that the integers will be silently munged by Javascript interpreters. In most cases, this will result in behavior such as being unable to load or delete a specific direct message, because the ID you're sending to the API is different than the actual identifier associated with the message." [1]) However, given that this is a significant change for API users, alternatives or a transition time may be appropriate. 1: https://blog.twitter.com/developer/en_us/a/2011/direct-messages-going-snowflake-on-sep-30-2011.html * Additional fixes for stringified IDs in JSON These should be the last two. These were identified using eslint to try to identify any plain casts to JavaScript numbers. (Some such casts are legitimate, but these were not.) Adding the following to .eslintrc.yml will identify casts to numbers: ~~~ no-restricted-syntax: - warn - selector: UnaryExpression[operator='+'] > :not(Literal) message: Avoid the use of unary + - selector: CallExpression[callee.name='Number'] message: Casting with Number() may coerce string IDs to numbers ~~~ The remaining three casts appear legitimate: two casts to array indices, one in a server to turn an environment variable into a number. * Back out RelationshipsController Change This was made to make a test a bit less flakey, but has nothing to do with this branch. * Change internal streaming payloads to stringified IDs as well Per https://github.com/tootsuite/mastodon/pull/5019#issuecomment-330736452 we need these changes to send deleted status IDs as strings, not integers.	8 years ago
Eugen Rochko	ad8e856a5b	Fix error when following locked accounts (#4896 ) (cherry picked from commit `0ef9d45d05`)	8 years ago
Eugen Rochko	472df24579	When web UI URL used while logged out, redirect to static page (#4954 )	8 years ago
Surinna Curtis	83b3a0389c	Add more specs for the /api/v1/mutes/details endpoint	8 years ago
Surinna Curtis	70592cdaba	Add a /api/v1/mutes/details route that just returns the array of mutes.	8 years ago
Surinna Curtis	eaaf2170fe	API support for muting notifications (and specs)	8 years ago
Eugen Rochko	0ef9d45d05	Fix error when following locked accounts (#4896 )	8 years ago
Surinna Curtis	3cac5bc2c3	Fix a spuriously failing spec that assumed we required short bios like upstream	8 years ago
Eugen Rochko	c450ddb613	Fix POST /api/v1/follows error when already following (#4878 )	8 years ago
Eugen Rochko	7d7844a47f	Default follows for new users (#4871 ) When a new user confirms their e-mail, bootstrap their home timeline by automatically following a set of accounts. By default, all local admin accounts (that are unlocked). Can be customized by new admin setting (comma-separated usernames, local and unlocked only)	8 years ago
Eugen Rochko	9b994c4aee	Fix #4794 - Fake instant follow in API response when account is believed unlocked (#4799 )	8 years ago
nullkal	2293466edd	Show pinned statuses only in the top of the profile page (#4803 ) * Show pinned statuses only in the top of the profile page * Refactor AccountsController#show_pinned_statuses?	8 years ago
unarist	6a4e2db661	Raise an error for remote url in StatusFinder (#4776 ) * Raise an error for remote url in StatusFinder Previous implementation had allowed remote url with status id which also exists on local. Then that bug leads /api/web/embed to return wrong embed url. * Fix oembed_controller_spec	8 years ago
Eugen Rochko	e95bdec7c5	Update status embeds (#4742 ) - Use statuses controller for embeds instead of stream entries controller - Prefer /@:username/:id/embed URL for embeds - Use /@:username as author_url in OEmbed - Add follow link to embeds which opens web intent in new window - Use redis cache in development - Cache entire embed	8 years ago
abcang	ce9a5f358e	rescue HTTP::ConnectionError in RemoteFollowController#create (#4726 )	8 years ago
nullkal	c2af138113	Allow multiple pinned statuses to be shown and make them be ordered b… (#4690 ) * Allow multiple pinned statuses to be shown and make them be ordered by pinned date * Set timestamps NOT NULL * Make single-line pinned_statuses * Spec for pinned_statuses * Remove redundant empty line	8 years ago
Eugen Rochko	9caa90025f	Pinned statuses (#4675 ) * Pinned statuses * yarn manage:translations	8 years ago
unarist	b01a19fe39	Fetch reblogs as Announce activity instead of Note object (#4672 ) * Process Create / Announce activity in FetchRemoteStatusService * Use activity URL in ActivityPub for reblogs * Redirect to the original status on StatusesController#show	8 years ago
Eugen Rochko	c66fe2aeba	Minor performance improvement for test suite (#4678 )	8 years ago
nullkal	80393a23d0	Use checkboxes for application scope setting (#4671 )	8 years ago
Eugen Rochko	c1b086a538	Fix up the applications area (#4664 ) - Section it into "Development" area - Improve UI of application form, index, and details	8 years ago
Colin Mitchell	871c0d251a	Application prefs section (#2758 ) * Add code for creating/managing apps to settings section * Add specs for app changes * Fix controller spec * Fix view file I pasted over by mistake * Add locale strings. Add 'my apps' to nav * Add Client ID/Secret to App page. Add some visual separation * Fix rubocop warnings * Fix embarrassing typo I lost an `end` statement while fixing a merge conflict. * Add code for creating/managing apps to settings section - Add specs for app changes - Add locale strings. Add 'my apps' to nav - Add Client ID/Secret to App page. Add some visual separation - Fix some bugs/warnings * Update to match code standards * Trigger notification * Add warning about not sharing API secrets * Tweak spec a bit * Cleanup fixture creation by using let! * Remove unused key * Add foreign key for application<->user	8 years ago
Eugen Rochko	74e5078795	Fix #4637 - Re-add missing doorkeeper_authorize for /api/v1/verify_credentials (#4650 )	8 years ago
Yamagishi Kazutoshi	2edfdab6e6	Don't send Link header when don't know prev and next links (#4633 )	8 years ago
Eugen Rochko	6df8bd277b	Set correct content-type for ActivityPub JSON (#4592 )	8 years ago
Eugen Rochko	4e75f0d889	Hook up URL-based resource look-up to ActivityPub (#4589 )	8 years ago
Eugen Rochko	a2aeacbfee	Add alternate links to ActivityPub resources from HTML/HEAD variants (#4586 )	8 years ago

1 2 3 4 5 ...

280 Commits (b28b405b9763a0bb3df653b51e6d084b42e9a54d)