This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.		2018-10-05 15:23:57 +02:00
..
about	Revert Font Awesome 5 upgrade (#8810)	2018-09-28 02:11:14 +02:00
accounts	Refactor active_nav_class for use with multiple paths (#8757)	2018-09-23 20:42:13 +02:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-05 15:23:57 +02:00
admin_mailer	…
application	Add separate setting for sidebar text (site_short_description) (#8107)	2018-07-31 18:59:34 +02:00
auth	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
authorize_interactions	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02: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	…
invites	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
kaminari	…
layouts	Revert Font Awesome 5 upgrade (#8810)	2018-09-28 02:11:14 +02:00
media	…
notification_mailer	…
oauth	…
remote_follow	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
remote_interaction	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02: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	2018-10-01 12:43:20 +02:00
shared	Add separate setting for sidebar text (site_short_description) (#8107)	2018-07-31 18:59:34 +02:00
shares	…
stream_entries	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-01 12:43:20 +02:00
tags	Merge branch 'master' into glitch-soc/merge	2018-05-11 18:12:42 +02:00
user_mailer	…
well_known	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00