Thibaut Girka 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
  conflicts caused by image URLs being different
- app/models/status.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
  some strings were changed upstream
- spec/models/status_spec.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline

2019-10-10 17:26:08 +02:00

..

controllers

Merge branch 'master' into glitch-soc/merge-upstream

2019-09-30 12:23:57 +02:00

fabricators

Merge branch 'master' into glitch-soc/merge-upstream

2019-09-30 12:23:57 +02:00

features

Change unconfirmed user login behaviour (#11375)

2019-07-22 10:48:50 +02:00

fixtures

Remove Salmon and PubSubHubbub (#11205)

2019-07-06 23:26:16 +02:00

helpers

Merge branch 'master' into glitch-soc/merge-upstream

2019-07-19 18:26:49 +02:00

lib

Merge branch 'master' into glitch-soc/merge-upstream

2019-10-10 17:26:08 +02:00

mailers

Add password challenge to 2FA settings, e-mail notifications (#11878)

2019-09-18 16:37:27 +02:00

models

Merge branch 'master' into glitch-soc/merge-upstream

2019-10-10 17:26:08 +02:00

policies

Merge branch 'master' into glitch-soc/merge-upstream

2019-08-06 13:16:53 +02:00

presenters

Merge branch 'master' into glitch-soc/merge-upstream

2019-03-14 17:17:20 +01:00

requests

Remove XML version of Webfinger and remove links to Atom feeds (#11460)

2019-08-01 19:14:02 +02:00

routing

Move create/destroy actions for api/v1/statuses to namespace (#3678)

2017-06-10 09:39:26 +02:00

serializers/activitypub

Fix account URI in UpdatePollSerializer (#11194)

2019-06-27 19:41:55 +02:00

services

Merge tag 'v3.0.0' into glitch-soc/merge-upstream

2019-10-04 19:49:43 +02:00

support

Remove empty strings (#5732)

2017-11-17 10:52:30 +09:00

validators

Merge branch 'master' into glitch-soc/merge-upstream

2019-08-06 13:16:53 +02:00

views

Merge branch 'master' into glitch-soc/merge-upstream

2019-07-19 18:26:49 +02:00

workers

Add domain block notes (#11515)

2019-08-07 20:20:23 +02:00

rails_helper.rb

Fix records not being indexed sometimes (#12024)

2019-10-01 01:19:11 +02:00

spec_helper.rb

Add ActivityPub actor representing the entire server (#11321)

2019-07-19 01:44:42 +02:00