tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
e7ed61917b045f15776adbf257501dc9dac85557
Mastodon/app/controllers
T
History
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master 
Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml
2018-05-10 00:03:28 +02:00
..
activitypub
Better pagination for ActivityPub outbox (#7356)
2018-05-04 19:19:11 +02:00
admin
Merge branch 'master' into glitch-soc/master
2018-05-10 00:03:28 +02:00
api
Merge branch 'master' into glitch-soc/master
2018-05-10 00:03:28 +02:00
auth
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-09 00:17:17 +00:00
concerns
Fix spec for sr-Latn (#7203)
2018-04-20 18:14:31 +02:00
oauth
…
settings
Merge branch 'master' into glitch-soc/master
2018-05-10 00:03:28 +02:00
well_known
…
about_controller.rb
Merge remote-tracking branch 'origin/master' into merge-upstream
2018-02-04 16:36:19 -06:00
account_follow_controller.rb
…
account_unfollow_controller.rb
…
accounts_controller.rb
Merge remote-tracking branch 'origin/master' into gs-master
2018-05-03 17:23:44 -05:00
application_controller.rb
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-04-03 19:17:20 +00:00
authorize_follows_controller.rb
…
emojis_controller.rb
…
follower_accounts_controller.rb
Merge remote-tracking branch 'origin/master' into gs-master
2018-05-04 14:16:30 -05:00
following_accounts_controller.rb
Merge remote-tracking branch 'origin/master' into gs-master
2018-05-04 14:16:30 -05:00
home_controller.rb
Merge remote-tracking branch 'origin/master' into gs-master
2018-04-18 18:48:12 -05:00
intents_controller.rb
…
invites_controller.rb
…
manifests_controller.rb
…
media_controller.rb
Save video metadata and improve video OpenGraph tags (#6481)
2018-02-16 07:22:20 +01:00
media_proxy_controller.rb
…
remote_follow_controller.rb
…
remote_unfollows.rb
Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)
2018-04-08 13:40:22 +02:00
shares_controller.rb
…
statuses_controller.rb
Merge remote-tracking branch 'origin/master' into gs-master
2018-05-03 17:23:44 -05:00
stream_entries_controller.rb
Merge remote-tracking branch 'origin/master' into gs-master
2018-05-03 17:23:44 -05:00
tags_controller.rb
Merge remote-tracking branch 'origin/master' into gs-master
2018-05-03 17:23:44 -05:00