luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-05 22:45:37 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views
History
Thibaut Girka cd99255698 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/controllers/oauth/authorizations_controller.rb

Just two changes being too close to one another.
Took both.
2018-09-11 16:51:26 +02:00
..
about Merge branch 'master' into glitch-soc/merge-upstream 2018-08-22 20:56:32 +02:00
accounts Use animation config for avatar in profile pages (#8614) 2018-09-07 05:43:09 +02:00
admin Allow to show a specific status in the admin interface 2018-09-03 18:19:11 +02:00
admin_mailer
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
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-09-11 16:51:26 +02:00
media
notification_mailer
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-09-03 14:33:06 +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-09-01 17:23:46 +02:00
tags Merge branch 'master' into glitch-soc/merge 2018-05-11 18:12:42 +02:00
user_mailer
well_known Add remote interaction dialog for toots (#8202) 2018-08-18 03:03:12 +02:00