David Yip 7174d1c955

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

Conflicts:
	app/javascript/images/mastodon-drawer.png
	app/javascript/styles/mastodon/components.scss

2017-12-26 22:24:19 -06:00

..

activitypub

Save media outside transaction (#5959)

2017-12-10 16:33:52 +01:00

ostatus

Save media outside transaction (#5959)

2017-12-10 16:33:52 +01:00

settings

Refactor Setting (#3302)

2017-05-25 14:14:36 +02:00

application_extension.rb

Conditional validations no longer accept strings for if/unless (#3124)

2017-05-19 03:11:23 +02:00

delivery_failure_tracker.rb

After 7 days of repeated delivery failures, give up on inbox (#5131)

2017-09-29 03:16:20 +02:00

exceptions.rb

Add callback_url/acct information for Sidekiq PuSH workers Exception. (#4281)

2017-07-27 00:38:20 +02:00

extractor.rb

Using double splat operator (#5859)

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

feed_manager.rb

Merge remote-tracking branch 'origin/master' into gs-master

2017-11-28 11:45:13 -06:00

formatter.rb

Using double splat operator (#5859)

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

frontmatter_handler.rb

createBio function added

2017-06-30 15:03:31 -07: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

Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)

2017-07-07 04:02:06 +02:00

language_detector.rb

Improve language filter (#5724)

2017-11-16 13:51:38 +01:00

provider_discovery.rb

Fix XML oEmbed support discovery (#6104)

2017-12-27 03:29:49 +01:00

request.rb

Using double splat operator (#5859)

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

sanitize_config.rb

Whitelist allowed classes for federated statuses (#3810)

2017-06-17 20:26:05 +02:00

status_filter.rb

Do not hide statuses from silenced accounts from other silenced accounts (#6030)

2017-12-15 01:54:05 +01:00

status_finder.rb

Raise an error for remote url in StatusFinder (#4776)

2017-09-02 17:42:47 +02:00

tag_manager.rb

Introduce OStatus::TagManager (#5008)

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

themes.rb

Screenshot support for themes

2017-12-10 20:32:28 -08:00

user_settings_decorator.rb

fixed fav setting change

2017-12-09 12:17:20 -06:00

webfinger_resource.rb

Allow webfinger controller to reply to user@WEB_DOMAIN in addition to user@LOCAL_DOMAIN (#2351)

2017-04-23 14:19:54 +02:00