David Yip 95c270f5b1 Merge remote-tracking branch 'origin/master' into gs-master

2017-11-28 11:45:13 -06:00

..

accounts

Non-Serial ("Snowflake") IDs (#4801)

2017-10-04 09:56: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

lists

Lists (#5703)

2017-11-18 00:16:48 +01:00

statuses

…

timelines

Merge remote-tracking branch 'origin/master' into merge-upstream

2017-11-17 17:40:00 -06:00

accounts_controller.rb

Allow hiding of reblogs from followed users (#5762)

2017-11-28 15:00:35 +01: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 pagination in Api::V1::BlocksController (#5285)

2017-10-09 17:30:31 +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

…

favourites_controller.rb

…

follow_requests_controller.rb

…

follows_controller.rb

…

instances_controller.rb

…

lists_controller.rb

Lists (#5703)

2017-11-18 00:16:48 +01:00

media_controller.rb

Add ability to specify alternative text for media attachments (#5123)

2017-09-28 15:31:31 +02:00

mutes_controller.rb

…

notifications_controller.rb

…

reports_controller.rb

Add moderator role and add pundit policies for admin actions (#5635)

2017-11-11 20:23:33 +01:00

search_controller.rb

Merge tootsuite/master at 3023725936

2017-11-16 01:21:16 -06:00

statuses_controller.rb

…

streaming_controller.rb

…