tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers
History
Thibaut Girka 24968d20a0 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock
2019-07-30 12:22:33 +02:00
..
activitypub
Add whitelist mode (#11291)
2019-07-30 11:10:46 +02:00
admin
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-30 12:22:33 +02:00
api
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-30 12:22:33 +02:00
auth
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-23 10:51:07 +02:00
concerns
Add whitelist mode (#11291)
2019-07-30 11:10:46 +02:00
oauth
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-23 10:51:07 +02:00
settings
Revert some refactoring in order to make codebase closer to upstream
2019-07-23 10:51:12 +02:00
well_known
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-24 16:23:53 +02:00
about_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-30 12:22:33 +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-07-23 10:51:07 +02:00
application_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-30 12:22:33 +02: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 custom CSS controller (#11336)
2019-07-17 17:14:25 +02:00
directories_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-30 12:22:33 +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
2018-10-26 20:41:43 +02:00
follower_accounts_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-19 18:26:49 +02:00
following_accounts_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-19 18:26:49 +02:00
home_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-30 12:22:33 +02:00
instance_actors_controller.rb
Add ActivityPub actor representing the entire server (#11321)
2019-07-19 01:44:42 +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-07-28 16:28:05 +02:00
manifests_controller.rb
Bump active_model_serializers from 0.10.9 to 0.10.10 (#11311)
2019-07-23 11:10:42 +02:00
media_controller.rb
Add whitelist mode (#11291)
2019-07-30 11:10:46 +02:00
media_proxy_controller.rb
Add whitelist mode (#11291)
2019-07-30 11:10:46 +02:00
public_timelines_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-30 12:22:33 +02:00
relationships_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-28 13:01:33 +01:00
remote_follow_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-19 18:26:49 +02:00
remote_interaction_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-30 12:22:33 +02:00
shares_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-08 15:57:56 +02:00
statuses_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-23 10:51:07 +02:00
tags_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-30 12:22:33 +02:00