Ondřej Hruška 83bda6c1a8

Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream

2017-09-28 09:18:35 +02:00

..

accounts

authorize-follow-requests-after-unlocking (#4658)

2017-08-26 12:40:03 +02:00

statuses

Pinned statuses (#4675)

2017-08-25 01:41:18 +02:00

timelines

Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)

2017-07-07 04:02:06 +02:00

accounts_controller.rb

Fix error when following locked accounts (#4896)

2017-09-16 11:10:33 -05:00

apps_controller.rb

Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)

2017-07-07 04:02:06 +02:00

blocks_controller.rb

Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)

2017-07-07 04:02:06 +02:00

custom_emojis_controller.rb

New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)

2017-09-23 01:57:23 +02:00

domain_blocks_controller.rb

Clean up for api/base controller (#3629)

2017-06-07 20:09:25 +02:00

favourites_controller.rb

Merge queries in Api::V1::FavouritesController (#4359)

2017-07-25 16:01:03 +02:00

follow_requests_controller.rb

Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)

2017-07-07 04:02:06 +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

media_controller.rb

Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)

2017-07-07 04:02:06 +02:00

mutes_controller.rb

Define a serializer for /api/v1/mutes/details

2017-09-13 21:47:30 -05:00

notifications_controller.rb

New notification cleaning mode (#89)

2017-07-21 20:33:16 +02:00

reports_controller.rb

Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)

2017-07-07 04:02:06 +02:00

search_controller.rb

Raise search results count to 10 for test

2017-07-15 15:42:24 +02:00

statuses_controller.rb

Make PreviewCard records reuseable between statuses (#4642)

2017-09-01 16:20:16 +02:00

streaming_controller.rb

Clean up for api/base controller (#3629)

2017-06-07 20:09:25 +02:00