mastodon

mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00

History

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

Conflicts:
	app/controllers/authorize_follows_controller.rb
	app/javascript/styles/mastodon/components.scss

2018-01-02 00:11:41 -06:00

about

Finalized theme loading and stuff

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

accounts

Merge remote-tracking branch 'tootsuite/master'

2017-11-19 01:30:29 -06:00

admin

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

2017-12-30 17:20:07 -06:00

admin_mailer

Make salutation of email localizable (#4454 )

2017-07-31 00:18:44 +02:00

application

Added haml-lint and fix warnings (#2773 )

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

auth

Add consumable invites (#5814 )

2017-11-27 16:07:59 +01:00

authorize_follows

Add "signed in as" header to some pages (#4523 )

2017-08-05 04:24:58 +02:00

errors

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

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

follower_accounts

Add option to opt out of search engines on public profile/status pages (#4199 )

2017-07-14 16:41:02 +02:00

following_accounts

Add option to opt out of search engines on public profile/status pages (#4199 )

2017-07-14 16:41:02 +02:00

home

Finalized theme loading and stuff

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

invites

Fix invites form path (#5861 )

2017-12-01 12:26:57 +01:00

kaminari

Pagination improvements (#1445 )

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

layouts

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

2018-01-02 00:11:41 -06:00

notification_mailer

Make salutation of email localizable (#4454 )

2017-07-31 00:18:44 +02:00

oauth

Oauth code in input form and add description message (#4986 )

2017-09-17 15:23:44 +02:00

remote_follow

Fix remote follow (#2547 )

2017-04-28 00:16:44 +02:00

settings

Added styling

2017-12-10 20:32:28 -08:00

shared

fix presented og:url is incorrect (#5320 )

2017-10-11 19:22:21 +02:00

Finalized theme loading and stuff

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

stream_entries

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

2017-12-12 02:54:13 -06:00