Thibaut Girka da24c6aced Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/serializers/rest/instance_serializer.rb - app/views/layouts/error.html.haml - public/oops.png Took our version (same as upstream but without the things that only make sense in an animation). Additional changes: - app/javascript/flavours/vanilla/theme.yml Include upstream's javascript in error pages.		2019-02-17 12:26:55 +01:00
..
about	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-08 13:51:33 +02:00
accounts	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-10 21:10:09 +01:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-10 21:10:09 +01:00
admin_mailer	Show remote reports in admin UI as coming from domain rather than user (#7347)	2018-05-04 13:26:25 +02:00
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	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-19 18:28:37 +01:00
errors	New error page graphic. Other error page improvements (#5099)	2017-09-25 23:05:54 +02:00
filters	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
follower_accounts	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
following_accounts	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
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	Pagination improvements (#1445)	2017-04-11 01:11:41 +02:00
layouts	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-17 12:26:55 +01:00
media	Save video metadata and improve video OpenGraph tags (#6481)	2018-02-16 07:22:20 +01:00
notification_mailer	Improve e-mail digest (#9689)	2019-01-02 10:47:32 +01:00
oauth	Oauth code in input form and add description message (#4986)	2017-09-17 15:23:44 +02:00
remote_follow	Change remote interaction dialog to use specific actions (#9743)	2019-01-07 15:36:26 +01:00
remote_interaction	Change remote interaction dialog to use specific actions (#9743)	2019-01-07 15:36:26 +01:00
remote_unfollows	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-10 21:10:09 +01:00
shared	Fix form validation flash message color and input borders (#9235)	2018-11-08 21:06:14 +01:00
shares	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
stream_entries	Make displaying application used to toot opt-in (#9897)	2019-02-02 19:18:15 +01:00
tags	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-19 18:28:37 +01:00
user_mailer	Add REST API for creating an account (#9572)	2018-12-24 19:12:38 +01:00
well_known	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00