Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.		2018-12-09 16:08:04 +01:00
..
about	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-08 13:51:33 +02:00
accounts	WebSub: ATOM before RSS (#9302)	2018-11-20 22:25:04 +01:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
admin_mailer	…
application	Escape HTML in profile name preview in profile settings (#9446)	2018-12-07 16:42:22 +01:00
auth	Change the password form order (#9267)	2018-11-16 11:18:43 +01:00
authorize_interactions	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
directories	Cache hashtag sample accounts, and exclude ineligible ones (#9465)	2018-12-08 01:32:26 +01:00
errors	…
filters	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
follower_accounts	…
following_accounts	…
home	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-07 19:47:56 +02:00
invites	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
kaminari	…
layouts	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
media	…
notification_mailer	…
oauth	…
remote_follow	…
remote_interaction	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
remote_unfollows	…
settings	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
shared	Fix form validation flash message color and input borders (#9235)	2018-11-08 21:06:14 +01:00
shares	…
stream_entries	Display a double reply arrow on public pages for toots that are replies	2018-11-30 22:09:52 +01:00
tags	…
user_mailer	…
well_known	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00