Thibaut Girka 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js		2018-09-19 21:46:01 +02:00
..
activitypub	Improve federated ID validation (#8372)	2018-08-22 20:55:14 +02:00
pubsubhubbub
account_search_service_spec.rb
after_block_domain_from_account_service_spec.rb
after_block_service_spec.rb
authorize_follow_service_spec.rb
batched_remove_status_service_spec.rb
block_domain_service_spec.rb
block_service_spec.rb
bootstrap_timeline_service_spec.rb
fan_out_on_write_service_spec.rb
favourite_service_spec.rb
fetch_atom_service_spec.rb
fetch_link_card_service_spec.rb
fetch_oembed_service_spec.rb
fetch_remote_account_service_spec.rb	Improve federated ID validation (#8372)	2018-08-22 20:55:14 +02:00
fetch_remote_status_service_spec.rb	Improve federated ID validation (#8372)	2018-08-22 20:55:14 +02:00
follow_service_spec.rb
mute_service_spec.rb
notify_service_spec.rb
post_status_service_spec.rb
precompute_feed_service_spec.rb
process_feed_service_spec.rb	Misc. typos (#8694)	2018-09-14 00:53:09 +02:00
process_interaction_service_spec.rb
process_mentions_service_spec.rb
reblog_service_spec.rb
reject_follow_service_spec.rb
remove_status_service_spec.rb
report_service_spec.rb	Add preference for report notification e-mails, skip for duplicates (#8559)	2018-09-02 00:11:58 +02:00
resolve_account_service_spec.rb
resolve_url_service_spec.rb
search_service_spec.rb
send_interaction_service_spec.rb
subscribe_service_spec.rb
suspend_account_service_spec.rb	Increase reach of Delete->Actor activities (#8305)	2018-08-20 13:28:05 +02:00
unblock_domain_service_spec.rb
unblock_service_spec.rb
unfollow_service_spec.rb
unmute_service_spec.rb
unsubscribe_service_spec.rb
update_remote_profile_service_spec.rb
verify_link_service_spec.rb	Fix failed profile verification when rel attribute including values other than me (#8733)	2018-09-19 16:47:31 +02:00