Thibaut Girka e5a603206d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/accounts_controller.rb app/javascript/mastodon/locales/pl.json app/views/about/more.html.haml Conflicts in `accounts_controller.rb` resolved by taking upstream's version + our `use_pack`. Conflicts in `pl.json` resolved by taking upstream's changes. Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.		2018-08-10 16:22:31 +02:00
..
about	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-10 16:22:31 +02:00
accounts	Public profile endorsements (accounts picked by profile owner) (#8146)	2018-08-09 09:56:53 +02:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-01 22:20:25 +02: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	Add separate setting for sidebar text (site_short_description) (#8107)	2018-07-31 18:59:34 +02:00
auth	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
authorize_follows	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
errors	New error page graphic. Other error page improvements (#5099)	2017-09-25 23:05:54 +02:00
filters	Add option to not consider word boundaries when processing keyword filtering (#7975)	2018-07-09 02:22:09 +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 remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
invites	Add autofollow option to invites (#7805)	2018-06-15 18:00:23 +02:00
kaminari	Pagination improvements (#1445)	2017-04-11 01:11:41 +02:00
layouts	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-01 00:18:13 +02: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	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
remote_unfollows	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
settings	Delete leftovers from keyword_mutes	2018-08-01 16:49:27 +02:00
shared	Add separate setting for sidebar text (site_short_description) (#8107)	2018-07-31 18:59:34 +02:00
shares	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
stream_entries	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-01 00:18:13 +02:00
tags	Merge branch 'master' into glitch-soc/merge	2018-05-11 18:12:42 +02:00
user_mailer	Fix e-mail changed notification (fixes #6778) (#6835)	2018-03-19 20:07:47 +01:00
well_known	Serialize webfinger XML with Ox instead of Nokogiri (#7319)	2018-05-02 22:28:46 +02:00