Thibaut Girka 5eb3b8522e Merge branch 'master' into glitch-soc/merge-upstream

2018-08-26 14:39:16 +02:00

..

about

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

2018-08-22 20:56:32 +02:00

accounts

Update _bio.html.haml (#8449)

2018-08-26 14:33:59 +02:00

admin

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

2018-08-26 14:23:24 +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

When registrations closed, link "Sign up" to joinmastodon.org (#8395)

2018-08-23 19:11:41 +02:00

authorize_interactions

Add remote interaction dialog for toots (#8202)

2018-08-18 03:03:12 +02:00

errors

…

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

…

layouts

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

2018-08-26 14:23:24 +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

Redesign public profiles and toots (#8068)

2018-07-28 19:25:33 +02:00

remote_interaction

Add remote interaction dialog for toots (#8202)

2018-08-18 03:03:12 +02:00

remote_unfollows

Redesign public profiles and toots (#8068)

2018-07-28 19:25:33 +02:00

settings

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

2018-08-17 17:43:54 +02:00

shared

Add separate setting for sidebar text (site_short_description) (#8107)

2018-07-31 18:59:34 +02:00

shares

…

stream_entries

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

2018-08-26 14:23:24 +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

Add remote interaction dialog for toots (#8202)

2018-08-18 03:03:12 +02:00