tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Mastodon/app/controllers
History
Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system
2020-01-24 14:37:06 +01:00
..
activitypub
Fix incoming federation in whitelist mode (#12185)
2019-10-24 22:45:35 +02:00
admin
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-24 14:37:06 +01:00
api
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-24 14:37:06 +01:00
auth
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-24 14:37:06 +01:00
concerns
Fix base64-encoded file uploads not being possible (#12748)
2020-01-04 01:54:07 +01:00
oauth
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-04 23:04:42 +01:00
settings
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-04 23:04:42 +01:00
well_known
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-04 23:04:42 +01:00
about_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-30 12:23:57 +02:00
account_follow_controller.rb
Restful refactor of accounts/ routes (#2133)
2017-04-19 13:52:37 +02:00
account_unfollow_controller.rb
Restful refactor of accounts/ routes (#2133)
2017-04-19 13:52:37 +02:00
accounts_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-10-03 11:10:12 +02:00
application_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-04 23:04:42 +01:00
authorize_interactions_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-18 18:04:49 +02:00
custom_css_controller.rb
Fix redirecting non-functional accounts on public pages (#11978)
2019-09-28 01:33:27 +02:00
directories_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-30 12:23:57 +02:00
emojis_controller.rb
Add (back) rails-level JSON caching (#11333)
2019-07-21 22:32:16 +02:00
filters_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-04 23:04:42 +01:00
follower_accounts_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-04 23:04:42 +01:00
following_accounts_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-04 23:04:42 +01:00
home_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
instance_actors_controller.rb
Fix reverse-proxy caching of instance actor object (#11561)
2019-08-13 15:30:37 +02:00
intents_controller.rb
Refactor controllers for statuses, accounts, and more (#11249)
2019-07-08 12:03:45 +02:00
invites_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
manifests_controller.rb
Fix redirecting non-functional accounts on public pages (#11978)
2019-09-28 01:33:27 +02:00
media_controller.rb
Fix redirecting non-functional accounts on public pages (#11978)
2019-09-28 01:33:27 +02:00
media_proxy_controller.rb
Fix redirecting non-functional accounts on public pages (#11978)
2019-09-28 01:33:27 +02:00
public_timelines_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
relationships_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-24 14:37:06 +01:00
remote_follow_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-30 12:23:57 +02:00
remote_interaction_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-30 12:23:57 +02:00
shares_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
statuses_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-24 14:37:06 +01:00
tags_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-30 12:23:57 +02:00