queer-af/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
mastodon/app/controllers/api/v1
History
Thibaut Girka 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
  conflicts caused by image URLs being different
- app/models/status.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
  some strings were changed upstream
- spec/models/status_spec.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
2019-10-10 17:26:08 +02:00
..
accounts Improve status pin query (#11972) 2019-09-27 15:23:30 +02:00
admin Change deletes to preserve soft-deleted statuses in unresolved reports (#11805) 2019-09-11 16:32:44 +02:00
apps
featured_tags Add featured tags API (#11778) 2019-09-09 10:50:33 +02:00
instances Fix GET /api/v1/instance REST APIs being unavailable in secure mode (#12089) 2019-10-06 22:11:29 +02:00
lists
polls
push Fix web push notifications for polls (#10864) 2019-05-28 00:26:08 +02:00
statuses Merge branch 'master' into glitch-soc/merge-upstream 2019-08-29 12:07:50 +02:00
timelines Merge branch 'master' into glitch-soc/merge-upstream 2019-10-10 17:26:08 +02:00
accounts_controller.rb Add reason param to POST /api/v1/accounts REST API (#12064) 2019-10-03 17:50:59 +02:00
apps_controller.rb Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
blocks_controller.rb
bookmarks_controller.rb
conversations_controller.rb
custom_emojis_controller.rb Change unlisted custom emoji to not appear in autosuggestions (#11818) 2019-09-13 16:01:09 +02:00
directories_controller.rb Add profile directory to web UI (#11688) 2019-08-30 00:14:36 +02:00
domain_blocks_controller.rb
endorsements_controller.rb
favourites_controller.rb
featured_tags_controller.rb Add featured tags API (#11778) 2019-09-09 10:50:33 +02:00
filters_controller.rb
follow_requests_controller.rb Add updated relationship to follow request API responses (#11800) 2019-09-10 20:56:42 +02:00
instances_controller.rb Fix GET /api/v1/instance REST APIs being unavailable in secure mode (#12089) 2019-10-06 22:11:29 +02:00
lists_controller.rb
markers_controller.rb Add timeline read markers API (#11762) 2019-09-06 13:55:51 +02:00
media_controller.rb
mutes_controller.rb
notifications_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-05-23 19:01:30 +02:00
polls_controller.rb Fix poll API not requiring authentication on non-public polls (#10960) 2019-06-04 20:10:26 +02:00
preferences_controller.rb
reports_controller.rb Add soft delete for statuses for instant deletes through API (#11623) 2019-08-22 21:55:56 +02:00
scheduled_statuses_controller.rb
statuses_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-08-29 12:07:50 +02:00
streaming_controller.rb Fix attachment not being re-downloaded even if file is not stored (#12125) 2019-10-09 07:10:46 +02:00
suggestions_controller.rb
trends_controller.rb Change admin UI for hashtags and add back whitelisted trends (#11490) 2019-08-05 19:54:29 +02:00