David Yip 67e77f230e Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/serializers/initial_state_serializer.rb The glitch flavour isn't yet pulling custom emoji data on its own (see https://github.com/tootsuite/mastodon/pull/7047). Once that gets into the glitch flavour, we can eliminate the custom_emojis load.		2018-04-08 19:05:02 -05:00
..
about	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-04 13:56:58 -05:00
accounts	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-08 19:05:02 -05:00
admin	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-04-03 19:17:20 +00:00
admin_mailer	Make salutation of email localizable (#4454)	2017-07-31 00:18:44 +02:00
application	Added haml-lint and fix warnings (#2773)	2017-05-08 03:35:25 +02:00
auth	Add headings to the security settings page (#6661)	2018-03-07 01:39:40 +01:00
authorize_follows	Note if the user is already following the target when authorizing follow (#6325)	2018-03-24 12:50:41 +01:00
errors	New error page graphic. Other error page improvements (#5099)	2017-09-25 23:05:54 +02:00
follower_accounts	Add missing meta description to profiles, some other SEO stuff (#6706)	2018-03-09 00:35:07 +01:00
following_accounts	Add missing meta description to profiles, some other SEO stuff (#6706)	2018-03-09 00:35:07 +01:00
home	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
invites	Invites: Add '1 week' as expire option (#6872)	2018-03-24 12:50:14 +01:00
kaminari	Pagination improvements (#1445)	2017-04-11 01:11:41 +02:00
layouts	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-11 09:17:21 +00:00
media	Save video metadata and improve video OpenGraph tags (#6481)	2018-02-16 07:22:20 +01:00
notification_mailer	Display content warning in mail notification emails (#6832)	2018-03-19 20:12:20 +01:00
oauth	Oauth code in input form and add description message (#4986)	2017-09-17 15:23:44 +02:00
remote_follow	Fix remote follow (#2547)	2017-04-28 00:16:44 +02:00
remote_unfollows	Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)	2018-04-08 13:40:22 +02:00
settings	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-03-02 21:46:44 -06:00
shared	fix presented og:url is incorrect (#5320)	2017-10-11 19:22:21 +02:00
shares	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
stream_entries	Merge remote-tracking branch 'origin/master' into gs-master	2018-03-18 20:21:17 -05:00
tags	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-03-02 21:46:44 -06:00
user_mailer	Fix e-mail changed notification (fixes #6778) (#6835)	2018-03-19 20:07:47 +01:00
well_known	Remove rabl dependency (#5894)	2017-12-06 15:04:49 +09:00