Thibaut Girka
1c9c0167b7
Merge branch 'master' into glitch-soc/master
...
Conflicts:
app/models/account.rb
app/views/accounts/_header.html.haml
2018-05-10 00:03:28 +02:00
abcang and Eugen Rochko
db012b57c2
Fix distribute_add_activity and distribute_remove_activity ( #7393 )
2018-05-07 09:30:18 +02:00
Thibaut Girka
50eb8f1f61
Add backend support for bookmarks
...
Bookmarks behave like favourites, except they aren't shared with other
users and do not have an associated counter.
2018-04-11 20:40:29 +02:00
Eugen Rochko and GitHub
33513753b9
Fix unpermitted parameters warning when generating pagination URLs ( #6995 )
2018-04-02 02:09:50 +02:00
Eugen Rochko and GitHub
9110db41c5
Federate pinned statuses over ActivityPub ( #6610 )
...
* Federate pinned statuses over ActivityPub
* Display pinned toots in web UI
Fix #6117
* Fix migration
* Fix tests
* Update outbox_serializer.rb
* Update remove_serializer.rb
* Update add_serializer.rb
* Update fetch_featured_collection_service.rb
2018-03-04 09:19:11 +01:00
Eugen Rochko and GitHub
9caa90025f
Pinned statuses ( #4675 )
...
* Pinned statuses
* yarn manage:translations
2017-08-25 01:41:18 +02:00
unarist and Eugen Rochko
1896a154f5
Fix response of unreblog/unfavourite APIs ( #4204 )
...
Both APIs process asynchronously, so reblogged/favourited fields in the response should be set to `false` manually.
2017-07-14 20:44:53 +02:00
Eugen Rochko and GitHub
8b2cad5637
Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl ( #4090 )
2017-07-07 04:02:06 +02:00
Matt Jankowski and Eugen Rochko
2925372ff4
Move create/destroy actions for api/v1/statuses to namespace ( #3678 )
...
Each of mute, favourite, reblog has been updated to:
- Have a separate controller with just a create and destroy action
- Preserve historical route names to not break the API
- Mild refactoring to break up long methods
2017-06-10 09:39:26 +02:00
Matt Jankowski and GitHub
5282ba862a
Move reblogged_by and favourited_by actions out of api/v1/statuses and into unique controllers ( #3646 )
...
* Add specs for api statuses routes
* Update favourited_by and reblogged_by api routes
* Move methods into new controllers
* Use load_accounts methods to simplify index actions
* Clean up load_accounts methods
* Clean up link header generation
* Check for link headers in specs
* Remove unused actions from api/v1/statuses controller
* Remove specs for moved actions
2017-06-09 14:12:40 -04:00