Mastodon

Files

David Yip e931cf656d Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions

Conflicts:
 	app/models/glitch/keyword_mute.rb

2018-06-12 16:39:30 -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

…

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

…

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

…

layouts

Hardcode default skin/theme in error layout (fixes #373 )

2018-05-31 14:38:48 +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

…

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

Add apply-to-mentions option to keyword mute UI. #454 .

2018-06-04 02:51:28 -05:00

shared

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

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

…

stream_entries

Merge branch 'master' into glitch-soc/master

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