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
..
accounts	Allow updating bio fields via PUT /api/v1/accounts/update_credentials (#7288)	2018-05-02 15:57:37 +02:00
apps	Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)	2017-09-30 22:05:42 +02:00
instances	Represent numbers by strings in instance activity API (#6198)	2018-01-05 22:38:33 +01:00
lists	Fix unpermitted parameters warning when generating pagination URLs (#6995)	2018-04-02 02:09:50 +02:00
statuses	Add backend support for bookmarks	2018-04-11 20:40:29 +02:00
timelines	Direct messages column (#4514)	2018-04-18 13:09:06 +02:00
accounts_controller.rb	Return HTTP 410 for suspended accounts in GET /api/v1/accounts/:id (#7287)	2018-04-30 09:12:36 +02:00
apps_controller.rb	Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)	2017-09-30 22:05:42 +02:00
blocks_controller.rb	Fix unpermitted parameters warning when generating pagination URLs (#6995)	2018-04-02 02:09:50 +02:00
bookmarks_controller.rb	Add backend support for bookmarks	2018-04-11 20:40:29 +02:00
custom_emojis_controller.rb	Improve admin UI for custom emojis, add copy/disable/enable (#5231)	2017-10-05 23:42:05 +02:00
domain_blocks_controller.rb	Fix unpermitted parameters warning when generating pagination URLs (#6995)	2018-04-02 02:09:50 +02:00
favourites_controller.rb	Fix unpermitted parameters warning when generating pagination URLs (#6995)	2018-04-02 02:09:50 +02:00
follow_requests_controller.rb	Fix unpermitted parameters warning when generating pagination URLs (#6995)	2018-04-02 02:09:50 +02:00
follows_controller.rb	Fix POST /api/v1/follows error when already following (#4878)	2017-09-10 15:09:06 +02:00
instances_controller.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	2017-07-07 04:02:06 +02:00
lists_controller.rb	Limit users to 50 lists, remove pagination from lists API (#5933)	2017-12-09 01:32:29 +01:00
media_controller.rb	Focal points (#6520)	2018-02-22 00:35:46 +01:00
mutes_controller.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-01 20:24:50 -05:00
notifications_controller.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-01 20:24:50 -05:00
reports_controller.rb	Federated reports (#6570)	2018-02-28 06:54:55 +01:00
search_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-03-02 21:46:44 -06:00
statuses_controller.rb	Paginate descendant statuses in public page (#7148)	2018-04-23 19:27:35 +02:00
streaming_controller.rb	Clean up for api/base controller (#3629)	2017-06-07 20:09:25 +02:00