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:
	.env.production.sample
	app/controllers/auth/confirmations_controller.rb
	db/schema.rb

2018-02-04 16:36:19 -06:00

about

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

2018-02-02 08:39:52 -06:00

accounts

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-08 10:17:15 +00:00

admin

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

2018-02-04 16:36:19 -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

CAS + SAML authentication feature (#6425 )

2018-02-04 05:42:13 +01:00

authorize_follows

Resolve URL for local account in follow authorization success view (#6324 )

2018-01-22 14:22:14 +01: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-28 22:45:17 -06:00

notification_mailer

Add direction tags to HTML e-mails for RTL languages (#6373 )

2018-01-29 00:22:20 +01: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

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

2018-02-02 08:39:52 -06: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 'origin/master' into merge-upstream

2018-01-09 14:16:45 -06:00