beatrix-bitrot 984d2d4cb6 Merge that good fresh upstream shit

2017-07-22 01:16:53 +00:00

..

activitypub

Improve ActivityPub representations (#3844)

2017-07-15 03:01:39 +02:00

ostatus

Correct OStatus inflection (Ostatus -> OStatus) (#4255)

2017-07-19 01:37:26 +02: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

emoji.rb

Use the same emoji data on the frontend and backend (#4284)

2017-07-21 04:27:40 +02:00

exceptions.rb

Fix webfinger retries (#4275)

2017-07-20 01:59:07 +02:00

extractor.rb

Skip formatting for cashtag in status text (#3275)

2017-05-24 14:32:53 +02:00

feed_manager.rb

Merge upstream (#81)

2017-07-15 14:33:15 -07:00

formatter.rb

Remove some arguments of Formatter.instance.format and spec (#3541)

2017-06-04 14:58:57 +02: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

Language detection defaults to nil (#3666)

2017-06-09 18:09:37 +02:00

provider_discovery.rb

HTTP signatures (#4146)

2017-07-14 20:41:49 +02:00

request.rb

HTTP signatures (#4146)

2017-07-14 20:41:49 +02:00

sanitize_config.rb

Whitelist allowed classes for federated statuses (#3810)

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

status_filter.rb

Fix regression from #3490 - filter out hidden statuses from ancestors/descendants even if the viewer is anonymous (#3752)

2017-06-15 02:00:08 +02:00

stream_entry_finder.rb

Improve api oembed controller (#3450)

2017-05-30 16:30:06 -04:00

tag_manager.rb

Optimize uri normalization (#4212)

2017-07-15 17:24:35 +02:00

user_settings_decorator.rb

Add unfollow modal (optional) (#4246)

2017-07-18 17:14:43 +02: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