1
0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-14 15:15:08 +01:00
mastodon/app/lib
Thibaut Girka a9eaa780f5 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
  Upstream cleaned up a bit, including on lines in which
  we replaced the hardcoded 500 character limit with a maxChar
  constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
  Moved upstream's new animated avatar hover handling in
  app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
  Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
  Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
  Upstream made repo URL configurable, did the same, but
  default to glitch-soc
2019-04-22 20:40:04 +02:00
..
activitypub Add ActivityPub representation for identity proofs () 2019-03-30 02:12:06 +01:00
ostatus When serializing polls over OStatus, serialize poll options to text () 2019-03-05 21:09:18 +01:00
proof_provider Default to the web domain (eg. mastodon.lubar.me) instead of the local domain (eg. lubar.me) for keybase proofs () 2019-04-21 04:53:24 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01:00
activity_tracker.rb Create Redisable#redis () 2019-02-02 19:11:38 +01:00
application_extension.rb Conditional validations no longer accept strings for if/unless () 2017-05-19 03:11:23 +02:00
delivery_failure_tracker.rb After 7 days of repeated delivery failures, give up on inbox () 2017-09-29 03:16:20 +02:00
entity_cache.rb Remove intermediary arrays when creating hash maps from results () 2018-11-16 15:02:18 +01:00
exceptions.rb Detect and prevent image bombs, max. processable dimension 4096^2 () 2018-04-23 09:16:38 +02:00
extractor.rb Using double splat operator () 2017-12-06 11:41:57 +01:00
fast_geometry_parser.rb Fix avatar and header issues by using custom geometry detector () 2018-02-21 03:40:12 +01:00
feed_manager.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
formatter.rb Rename :poll to :preloadable_poll and :owned_poll to :poll on Status () 2019-03-28 04:44:59 +01:00
hash_object.rb Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings 2017-01-12 20:46:24 +01:00
inline_renderer.rb Add conversations API () 2018-10-07 23:44:58 +02:00
language_detector.rb Change language detector threshold from 140 characters to 4 words () 2019-03-26 01:23:59 +01:00
potential_friendship_tracker.rb Create Redisable#redis () 2019-02-02 19:11:38 +01:00
proof_provider.rb Add Keybase integration () 2019-03-18 21:00:55 +01:00
request.rb Increase DNS timeouts () 2019-03-11 13:27:57 +01:00
rss_builder.rb Add RSS feeds for end-users () 2018-04-25 02:10:02 +02:00
sanitize_config.rb Whitelist dat/ipfs/gopher links in sanitizer () 2018-07-16 22:17:43 +09:00
sidekiq_error_handler.rb Raise Mastodon::HostValidationError when host for HTTP request is private () 2018-02-24 19:16:11 +01:00
status_filter.rb Fix n+1 queries in StatusThreadingConcern () 2018-05-03 10:41:58 +02:00
status_finder.rb Raise an error for remote url in StatusFinder () 2017-09-02 17:42:47 +02:00
tag_manager.rb Introduce OStatus::TagManager () 2017-09-19 18:08:08 +02:00
themes.rb Allow selecting both default flavour and theme 2018-10-12 19:06:35 +02:00
user_settings_decorator.rb Make displaying application used to toot opt-in () 2019-02-02 19:18:15 +01:00
webfinger_resource.rb Allow webfinger controller to reply to user@WEB_DOMAIN in addition to user@LOCAL_DOMAIN () 2017-04-23 14:19:54 +02:00