djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-24 17:14:15 -05:00
Code Issues Packages Projects Releases Wiki Activity
c816701550
tootlab-mastodon/app/controllers
History
David Yip c816701550
Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	.travis.yml
 	Gemfile.lock
 	README.md
 	app/controllers/settings/follower_domains_controller.rb
 	app/controllers/statuses_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/lib/feed_manager.rb
 	app/models/media_attachment.rb
 	app/models/mute.rb
 	app/models/status.rb
 	app/services/mute_service.rb
 	app/views/home/index.html.haml
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/ca.yml
 	config/locales/en.yml
 	config/locales/es.yml
 	config/locales/fr.yml
 	config/locales/nl.yml
 	config/locales/pl.yml
 	config/locales/pt-BR.yml
 	config/themes.yml
2018-05-03 17:23:44 -05:00
..
activitypub Federate pinned statuses over ActivityPub (#6610) 2018-03-04 09:19:11 +01:00
admin Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
api Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05: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 change pack to 'auth' 2017-12-11 18:14:41 -06:00
settings Slightly reduce RAM usage (#7301) 2018-05-02 18:58:48 +02:00
well_known Make host_meta/webfinger replies cacheable (fixes #6100) (#6101) 2017-12-27 18:21:12 +01:00
about_controller.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-04 16:36:19 -06: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 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 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-24 19:17:11 +00:00
emojis_controller.rb Cache JSON of immutable ActivityPub representations (#6171) 2018-01-04 01:21:38 +01:00
follower_accounts_controller.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
following_accounts_controller.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
home_controller.rb Merge remote-tracking branch 'origin/master' into gs-master 2018-04-18 18:48:12 -05:00
intents_controller.rb Add protocol handler. Handle follow intents (#4511) 2017-08-14 04:53:31 +02:00
invites_controller.rb Use settings pack for InvitesController (#229) 2017-12-06 17:20:04 -06:00
manifests_controller.rb Make Chrome splash screen same color as web UI's background color (#5169) 2017-10-02 01:23:32 +02:00
media_controller.rb Save video metadata and improve video OpenGraph tags (#6481) 2018-02-16 07:22:20 +01:00
media_proxy_controller.rb Fix incomplete account records being read (#4998) 2017-09-19 06:53:16 +02:00
remote_follow_controller.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-02 00:11:41 -06:00
remote_unfollows.rb Fix follow/unfollow buttons on public profile (fixes #7036) (#7040) 2018-04-08 13:40:22 +02:00
shares_controller.rb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-17 16:17:10 +00:00
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