luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-12 08:25:19 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/services
History
Thibaut Girka bf94a43496 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/oauth/authorized_applications_controller.rb
  Two changes too close to each other
- app/controllers/settings/sessions_controller.rb
- app/lib/user_settings_decorator.rb
  Two changes too close to each other
- app/models/media_attachment.rb
  New changes too close to glitch-soc only changes.
- app/models/user.rb
  Two changes too close to each other.
- app/services/remove_status_service.rb
  Kept direct timeline code which had been removed upstream.
- app/views/settings/preferences/show.html.haml
  Two changes too close to each other.
- config/locales/en.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/ja.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/pl.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/simple_form.en.yml
  Introduction of a new string too close to glitch-soc-only's “skin”
- config/locales/simple_form.pl.yml
  Introduction of a new string too close to glitch-soc-only's “skin”
- config/settings.yml
  Reverted upstream's decision of enabling posting application by default.
2019-02-10 21:10:09 +01:00
..
activitypub Fix Tombstone.delete_all ArgumentError (#9978) 2019-02-06 02:50:52 +01:00
concerns Optimize the process of following someone (#9220) 2018-11-08 21:05:42 +01:00
pubsubhubbub Remove redundant (#9503) 2018-12-12 05:54:34 +01:00
account_search_service.rb Prevent suspended accounts from appearing in AccountSearchService (#7246) 2018-04-23 21:27:18 +02:00
after_block_domain_from_account_service.rb Reduce usage of LD signatures (#9659) 2018-12-30 09:48:59 +01:00
after_block_service.rb Add conversations API (#8832) 2018-10-07 23:44:58 +02:00
app_sign_up_service.rb Add locale param to sign-up API (#9747) 2019-01-07 14:50:20 +01:00
authorize_follow_service.rb Reduce usage of LD signatures (#9659) 2018-12-30 09:48:59 +01:00
backup_service.rb Add bookmarks to archive takeout 2018-08-30 16:29:47 +02:00
base_service.rb Remove unused AtomBuilderHelper (#1364) 2017-04-11 19:31:22 +02:00
batched_remove_status_service.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
block_domain_service.rb Get rid of all batch order warnings (#8334) 2018-08-21 12:25:50 +02:00
block_service.rb Reduce usage of LD signatures (#9659) 2018-12-30 09:48:59 +01:00
bootstrap_timeline_service.rb Add autofollow option to invites (#7805) 2018-06-15 18:00:23 +02:00
fan_out_on_write_service.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-30 17:52:08 +01:00
favourite_service.rb Fix activity:interactions counter to count all interactions (#8037) 2018-07-16 18:35:43 +02:00
fetch_atom_service.rb Ignore JSON-LD profile in mime type comparison (#9179) 2018-11-22 12:49:07 +01:00
fetch_link_card_service.rb Ignore low-confidence CharlockHolmes guesses when parsing link cards (#9510) 2018-12-17 19:19:45 +01:00
fetch_oembed_service.rb Fix undefined method error in sidekiq (#9807) 2019-01-14 17:28:41 +01:00
fetch_remote_account_service.rb Improve federated ID validation (#8372) 2018-08-22 20:55:14 +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 Create Redisable#redis (#9633) 2019-02-02 19:11:38 +01:00
hashtag_query_service.rb Simplify hashtag query service, perf increase for 'any' tags (#9298) 2018-11-19 12:49:50 +01:00
import_service.rb Add option to overwrite imported data (#9962) 2019-02-03 03:59:51 +01:00
mute_service.rb Add conversations API (#8832) 2018-10-07 23:44:58 +02:00
notify_service.rb Always let through notifications from staff (#9152) 2018-10-30 15:02:55 +01:00
post_status_service.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
precompute_feed_service.rb Fix code style of regeneration-related code (#9843) 2019-01-18 01:02:51 +01:00
process_feed_service.rb Using double splat operator (#5859) 2017-12-06 11:41:57 +01:00
process_hashtags_service.rb Add featured hashtags to profiles (#9755) 2019-02-04 04:25:59 +01:00
process_interaction_service.rb Introduce OStatus::TagManager (#5008) 2017-09-19 18:08:08 +02:00
process_mentions_service.rb Reduce usage of LD signatures (#9659) 2018-12-30 09:48:59 +01:00
reblog_service.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-07-17 22:05:25 +02:00
reject_follow_service.rb Reduce usage of LD signatures (#9659) 2018-12-30 09:48:59 +01:00
remove_status_service.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
report_service.rb Use Contact User as Relay, Report, Subscribe. (#9661) 2019-01-05 07:17:12 +01:00
resolve_account_service.rb Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
resolve_url_service.rb Update resolve_url_service.rb (#9188) 2018-11-05 18:54:07 +01:00
search_service.rb Skip full text search if failed (#9654) 2018-12-30 19:00:29 +01:00
send_interaction_service.rb Close http connection in perform method of Request class (#6889) 2018-03-24 12:49:54 +01:00
subscribe_service.rb Close http connection in perform method of Request class (#6889) 2018-03-24 12:49:54 +01:00
suspend_account_service.rb Add scheduled statuses (#9706) 2019-01-05 12:43:28 +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 Reduce usage of LD signatures (#9659) 2018-12-30 09:48:59 +01:00
unfavourite_service.rb Add handling of Linked Data Signatures in payloads (#4687) 2017-08-26 13:47:38 +02:00
unfollow_service.rb Reject existing Follow in addition to sending a Block (#9811) 2019-01-18 15:57:19 +01:00
unmute_service.rb Fix #231 - Muting 2017-03-02 18:49:32 +01:00
unsubscribe_service.rb Close http connection in perform method of Request class (#6889) 2018-03-24 12:49:54 +01:00
update_account_service.rb Error message for avatar image that's too large. #9204 (#9518) 2018-12-14 05:07:21 +01:00
update_remote_profile_service.rb Fix custom emoji handling in UpdateRemoteProfileService (OStatus) (#7501) 2018-05-15 16:03:34 +02:00
verify_link_service.rb Rescue SSL error in verify link service (#9914) 2019-01-24 15:38:18 +01:00
verify_salmon_service.rb Introduce OStatus::TagManager (#5008) 2017-09-19 18:08:08 +02:00