Thibaut Girka 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.		2019-03-14 17:17:20 +01:00
..
about	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-14 17:17:20 +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-03-14 17:17:20 +01:00
admin_mailer	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
application	Escape HTML in profile name preview in profile settings (#9446)	2018-12-07 16:42:22 +01:00
auth	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
authorize_interactions
directories	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-19 18:28:37 +01:00
errors
filters
follower_accounts
following_accounts
home
invites	Improve invites list with click-to-copy inputs (#10259)	2019-03-14 05:25:49 +01:00
kaminari
layouts	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-14 17:17:20 +01:00
media
notification_mailer	Improve e-mail digest (#9689)	2019-01-02 10:47:32 +01:00
oauth
public_timelines	[Glitch] Redesign landing page	2019-03-13 15:53:00 +01:00
remote_follow	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
remote_interaction	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
remote_unfollows
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	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
well_known