mastodon/app/views
Thibaut Girka 02062aab55 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/about_controller.rb
- app/controllers/tags_controller.rb
- app/views/about/show.html.haml
- spec/views/about/show.html.haml_spec.rb
2019-03-13 15:16:02 +01:00
..
about Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 15:16:02 +01: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-19 20:18:40 +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 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-19 18:28:37 +01:00
errors
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
layouts Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 15:16:02 +01:00
media
notification_mailer Improve e-mail digest (#9689) 2019-01-02 10:47:32 +01:00
oauth
public_timelines Redesign landing page (#10232) 2019-03-12 17:34:00 +01:00
remote_follow Fix remote interaction dialogs being indexed by search engines (#10240) 2019-03-11 20:47:50 +01:00
remote_interaction Fix remote interaction dialogs being indexed by search engines (#10240) 2019-03-11 20:47:50 +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
stream_entries Merge branch 'master' into glitch-soc/merge-upstream 2019-03-08 00:57:13 +01:00
tags Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 15:16:02 +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