Mastodon

History

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

Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
- config/locales/simple_form.en.yml

2019-06-26 23:19:22 +02:00

about

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

2019-06-10 18:59:53 +02:00

accounts

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

2019-06-10 18:59:53 +02:00

admin

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

2019-06-24 15:02:59 +02:00

admin_mailer

Add invite request to pending account notification e-mail (#10528 )

2019-04-10 00:36:01 +02:00

application

…

auth

Fix sign up button not saying sign up when invite is used (#10623 )

2019-04-23 04:39:21 +02:00

authorize_interactions

…

directories

…

errors

…

filters

…

follower_accounts

…

following_accounts

…

home

…

invites

…

kaminari

…

layouts

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

2019-06-10 18:59:53 +02:00

media

…

notification_mailer

…

oauth

Add button to conveniently copy OAuth code (#11065 )

2019-06-13 00:14:42 +02:00

public_timelines

…

relationships

…

remote_follow

…

remote_interaction

…

remote_unfollows

…

settings

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

2019-06-26 23:19:22 +02:00

shared

…

stream_entries

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

2019-06-24 15:02:59 +02:00