David Yip 932571fa22 Merge tag 'v1.6.0' into sync/upstream

2017-09-10 13:04:27 -05:00

..

concerns

Pinned statuses (#4675)

2017-08-25 01:41:18 +02:00

form

Default follows for new users (#4871)

2017-09-10 09:58:38 +02:00

web

Fix WebPush (regression from #4524) (#4778)

2017-09-02 16:50:42 +02:00

account_domain_block.rb

…

account_filter.rb

…

account.rb

Merge branch 'origin/master' into sync/upstream

2017-09-09 14:27:47 -05:00

application_record.rb

…

block.rb

…

context.rb

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

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

conversation_mute.rb

…

conversation.rb

…

domain_block.rb

Allow domain blocks that only reject media without silencing or suspending (#4325)

2017-07-24 14:26:55 +02:00

export.rb

…

favourite.rb

…

feed.rb

…

follow_request.rb

…

follow.rb

…

import.rb

Validate data of Imports (#4782)

2017-09-02 20:45:42 +02:00

instance.rb

…

media_attachment.rb

Make PreviewCard records reuseable between statuses (#4642)

2017-09-01 16:20:16 +02:00

mention.rb

…

mute.rb

…

notification.rb

…

preview_card.rb

Make PreviewCard records reuseable between statuses (#4642)

2017-09-01 16:20:16 +02:00

remote_follow.rb

rescue HTTP::ConnectionError in RemoteFollowController#create (#4726)

2017-08-28 19:12:09 +02:00

remote_profile.rb

…

report_filter.rb

…

report.rb

Feat add validation for report comment: characters under 1000 valid (#4833)

2017-09-07 09:55:42 +02:00

search.rb

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

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

session_activation.rb

Refactor Web::PushSubscription, remove welcome message (#4524)

2017-09-01 13:35:23 +02:00

setting.rb

…

status_pin.rb

Allow multiple pinned statuses to be shown and make them be ordered b… (#4690)

2017-08-25 18:50:52 +02:00

status.rb

Fix #4834 - Adjust Status#local and Status#remote scopes (#4839)

2017-09-07 20:18:34 +02:00

stream_entry.rb

…

subscription.rb

Periodically remove expired PuSH subscribers (#4654)

2017-08-21 22:56:33 +02:00

tag.rb

add validation to tag name (#4194)

2017-07-14 11:02:49 +02:00

user.rb

Use request.remote_ip instead of request.ip (#4744)

2017-08-30 10:24:30 +02:00

web.rb

…