gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-12-11 11:02:41 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
b9f7bc149b
mastodon/app/controllers
History
David Yip b9f7bc149b Merge branch 'origin/master' into sync/upstream 
Conflicts:
	app/javascript/mastodon/components/status_list.js
	app/javascript/mastodon/features/notifications/index.js
	app/javascript/mastodon/features/ui/components/modal_root.js
	app/javascript/mastodon/features/ui/components/onboarding_modal.js
	app/javascript/mastodon/features/ui/index.js
	app/javascript/styles/about.scss
	app/javascript/styles/accounts.scss
	app/javascript/styles/components.scss
	app/presenters/instance_presenter.rb
	app/services/post_status_service.rb
	app/services/reblog_service.rb
	app/views/about/more.html.haml
	app/views/about/show.html.haml
	app/views/accounts/_header.html.haml
	config/webpack/loaders/babel.js
	spec/controllers/api/v1/accounts/credentials_controller_spec.rb
2017-09-09 14:27:47 -05:00
..
activitypub Add sharedInbox to actors (#4737) 2017-08-31 00:02:59 +02:00
admin Fix typo in admin/status_controller.rb (#4679) 2017-08-24 04:03:52 +02:00
api Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
auth Redirect to PasswordController#new when reset_password_token is invalid (#4506) 2017-08-03 17:45:45 +02:00
concerns Support more variations of ActivityPub keyId in signature (#4630) 2017-08-21 22:57:34 +02:00
oauth Fix #1165 - before_action was called before protect_from_forgery 2017-04-08 02:30:50 +02:00
settings authorize-follow-requests-after-unlocking (#4658) 2017-08-26 12:40:03 +02:00
well_known Ensure well_known controllers use WEB_DOMAIN by including RoutingHelper (#2388) 2017-06-02 22:21:36 +02:00
about_controller.rb Redesign the landing page, mount public timeline on it (#4122) 2017-07-11 15:27:59 +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 Allow multiple pinned statuses to be shown and make them be ordered b… (#4690) 2017-08-25 18:50:52 +02:00
application_controller.rb Add "signed in as" header to some pages (#4523) 2017-08-05 04:24:58 +02:00
authorize_follows_controller.rb Add "signed in as" header to some pages (#4523) 2017-08-05 04:24:58 +02:00
follower_accounts_controller.rb Set correct content-type for ActivityPub JSON (#4592) 2017-08-14 04:16:43 +02:00
following_accounts_controller.rb Set correct content-type for ActivityPub JSON (#4592) 2017-08-14 04:16:43 +02:00
home_controller.rb Multiple frontend support (#110) 2017-07-30 19:28:21 +02:00
intents_controller.rb Add protocol handler. Handle follow intents (#4511) 2017-08-14 04:53:31 +02:00
manifests_controller.rb Fix #3063 - Add dynamic app manifest (#3563) 2017-06-06 19:29:42 +02:00
media_controller.rb Extract authorization policy for viewing statuses (#3150) 2017-05-29 18:22:22 +02:00
remote_follow_controller.rb Add "signed in as" header to some pages (#4523) 2017-08-05 04:24:58 +02:00
shares_controller.rb Make share intent modal to make "signed in as" shown. (#4611) 2017-08-16 16:48:44 +02:00
statuses_controller.rb Update status embeds (#4742) 2017-08-30 10:23:43 +02:00
stream_entries_controller.rb Update status embeds (#4742) 2017-08-30 10:23:43 +02:00
tags_controller.rb Set correct content-type for ActivityPub JSON (#4592) 2017-08-14 04:16:43 +02:00