David Yip 8142bd2553 Merge remote-tracking branch 'tootsuite/master' into merge-upstream ...

Conflicts:
 	app/models/status.rb

The conflict in the Status model was due to
https://github.com/tootsuite/mastodon/commit/5bf500338478f819a65d25636a0af61a482972d3.
It was resolved by accepting tootsuite's changes.

2018-06-07 05:13:49 -05:00

..

about

Merge branch 'master' into glitch-soc/master

2018-05-10 00:03:28 +02:00

accounts

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-05-18 08:47:10 -05:00

admin

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2018-06-07 05:13:49 -05: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

Added haml-lint and fix warnings (#2773)

2017-05-08 03:35:25 +02:00

auth

Add contact e-mail hint to 2FA login form (#7376)

2018-05-06 10:52:36 +02:00

authorize_follows

Enable custom emojis in profiles (notes, field values, display names) (#7374)

2018-05-06 11:48:51 +02:00

errors

New error page graphic. Other error page improvements (#5099)

2017-09-25 23:05:54 +02:00

follower_accounts

Add preference to hide following/followers lists (#7532)

2018-05-18 02:26:51 +02:00

following_accounts

Add preference to hide following/followers lists (#7532)

2018-05-18 02:26:51 +02:00

home

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05:00

invites

Able to deactivate invites if they aren't expired (#7163)

2018-04-17 13:52:08 +02:00

kaminari

Pagination improvements (#1445)

2017-04-11 01:11:41 +02:00

layouts

Merge branch 'master' into glitch-soc/merge-upstream

2018-05-19 22:41:10 +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

Disables autocorrect/autocapitalize on remote username field. (#7549)

2018-05-19 19:36:23 +02:00

remote_unfollows

Enable custom emojis in profiles (notes, field values, display names) (#7374)

2018-05-06 11:48:51 +02:00

settings

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-05-18 08:47:10 -05:00

shared

Enable custom emojis in profiles (notes, field values, display names) (#7374)

2018-05-06 11:48:51 +02:00

shares

Finalized theme loading and stuff

2017-11-20 22:13:37 -08:00

stream_entries

Merge branch 'master' into glitch-soc/master

2018-05-10 00:03:28 +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