Mastodon

Files

T

Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.

2018-12-23 11:28:28 +01:00

about

…

accounts

Move hide_followers_count logic to an helper

2018-12-20 14:51:12 +01:00

admin

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

2018-12-23 11:28:28 +01:00

admin_mailer

…

application

Escape HTML in profile name preview in profile settings (#9446 )

2018-12-07 16:42:22 +01:00

auth

Change the password form order (#9267 )

2018-11-16 11:18:43 +01:00

authorize_interactions

…

directories

Move hide_followers_count logic to an helper

2018-12-20 14:51:12 +01:00

errors

…

filters

…

follower_accounts

…

following_accounts

…

home

…

invites

…

kaminari

…

layouts

Restore oops.gif animation for user who have auto_play_gif set

2018-12-19 20:49:58 +01:00

media

…

notification_mailer

…

oauth

…

remote_follow

…

remote_interaction

…

remote_unfollows

…

settings

Add a per-user setting to hide followers count

2018-12-20 14:51:12 +01:00

shared

…

stream_entries

Display a double reply arrow on public pages for toots that are replies

2018-11-30 22:09:52 +01:00