David Yip 201e82686f

Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
      app/javascript/styles/mastodon/components.scss

2018-01-17 18:37:09 -06:00

..

activitypub

Allow attributedTo in a status to be an embedded object (#6238)

2018-01-15 06:51:46 +01:00

concerns

Introduce OStatus::TagManager (#5008)

2017-09-19 18:08:08 +02:00

pubsubhubbub

Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205)

2017-07-14 23:01:20 +02:00

account_search_service.rb

Fix account and tag searches with leading/trailing spaces (#5965)

2017-12-10 19:35:46 +01:00

after_block_service.rb

Optimize MuteService and AfterBlockService (#2836)

2017-05-06 16:31:07 +02:00

authorize_follow_service.rb

Using double splat operator (#5859)

2017-12-06 11:41:57 +01:00

base_service.rb

Remove unused AtomBuilderHelper (#1364)

2017-04-11 19:31:22 +02:00

batched_remove_status_service.rb

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-04 23:17:11 +00:00

block_domain_from_account_service.rb

Add buttons to block and unblock domain (#3127)

2017-05-19 21:05:32 +02:00

block_domain_service.rb

Admin interface for listing, adding and removing custom emojis (#5002)

2017-09-19 03:52:38 +02:00

block_service.rb

Add handling of Linked Data Signatures in payloads (#4687)

2017-08-26 13:47:38 +02:00

bootstrap_timeline_service.rb

Default follows for new users (#4871)

2017-09-10 09:58:38 +02:00

fan_out_on_write_service.rb

Merge remote-tracking branch 'origin/master' into merge-upstream

2017-11-17 17:40:00 -06:00

favourite_service.rb

Add handling of Linked Data Signatures in payloads (#4687)

2017-08-26 13:47:38 +02:00

fetch_atom_service.rb

When fetching an ActivityPub-enabled status, do not re-request it as text/html (#6196)

2018-01-05 22:42:50 +01:00

fetch_link_card_service.rb

Fix redundant HTTP request in FetchLinkCardService (#6002)

2017-12-13 12:15:28 +01:00

fetch_remote_account_service.rb

Validate id of ActivityPub representations (#5114)

2017-10-04 01:13:48 +02:00

fetch_remote_resource_service.rb

Fix regression in FetchRemoteResourceService (#5217)

2017-10-05 00:21:44 +02:00

fetch_remote_status_service.rb

Change conditional to avoid nil into string error in sidekiq (#5987)

2017-12-12 15:11:13 +01:00

follow_service.rb

Fix #5952 - NameError (regression from #5762) (#5999)

2017-12-13 04:12:38 +01:00

mute_service.rb

Optional notification muting (#5087)

2017-11-15 03:56:41 +01:00

notify_service.rb

Allow hiding of reblogs from followed users (#5762)

2017-11-28 15:00:35 +01:00

post_status_service.rb

post_status_service: stylistic change (local_only -> local_only?)

2017-12-11 15:27:31 -06:00

precompute_feed_service.rb

Fix home regeneration (#6251)

2018-01-17 23:56:03 +01:00

process_feed_service.rb

Using double splat operator (#5859)

2017-12-06 11:41:57 +01:00

process_hashtags_service.rb

Unify the method of extracting tags (#3138)

2017-05-19 20:19:14 +02:00

process_interaction_service.rb

Introduce OStatus::TagManager (#5008)

2017-09-19 18:08:08 +02:00

process_mentions_service.rb

Reduce the number of synchronous resolves when posting toots (#6075)

2017-12-22 02:15:08 +01:00

reblog_service.rb

reblog_service.rb: Status#local_only -> local_only?

2017-12-11 17:39:11 -06:00

reject_follow_service.rb

Add handling of Linked Data Signatures in payloads (#4687)

2017-08-26 13:47:38 +02:00

remove_status_service.rb

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-06 20:17:13 +00:00

resolve_remote_account_service.rb

Fix #5926 - Do not downgrade to OStatus once ActivityPub is known (#5929)

2017-12-09 01:24:47 +01:00

search_service.rb

Add list of lists component to web UI (#5811)

2017-12-05 23:02:27 +01:00

send_interaction_service.rb

Close connection when succeeded posting (#5390)

2017-10-14 14:38:57 +02:00

subscribe_service.rb

Close connection when succeeded posting (#5390)

2017-10-14 14:38:57 +02:00

suspend_account_service.rb

Send one Delete of Actor in ActivityPub when account is suspended (#6172)

2018-01-04 14:40:49 +01:00

unblock_domain_service.rb

Allow domain blocks that only reject media without silencing or suspending (#4325)

2017-07-24 14:26:55 +02:00

unblock_service.rb

Add handling of Linked Data Signatures in payloads (#4687)

2017-08-26 13:47:38 +02:00

unfavourite_service.rb

Add handling of Linked Data Signatures in payloads (#4687)

2017-08-26 13:47:38 +02:00

unfollow_service.rb

Make "unfollow" undo pending outgoing follow request too (#4781)

2017-09-02 20:44:41 +02:00

unmute_service.rb

Fix #231 - Muting

2017-03-02 18:49:32 +01:00

unsubscribe_service.rb

Close connection when succeeded posting (#5390)

2017-10-14 14:38:57 +02:00

update_account_service.rb

authorize-follow-requests-after-unlocking (#4658)

2017-08-26 12:40:03 +02:00

update_remote_profile_service.rb

Account deletion (#3728)

2017-06-14 18:01:27 +02:00

verify_salmon_service.rb

Introduce OStatus::TagManager (#5008)

2017-09-19 18:08:08 +02:00