Commit Graph

6449 Commits

Author SHA1 Message Date
Alex S 252e5db45c docs fixes 2019-09-06 16:37:18 +03:00
Alex S a1125bd564 generatoin and fetching 2019-09-05 16:02:20 +03:00
Alex S 79dde58044 one more temp commit 2019-09-05 16:02:20 +03:00
Alex S db690bede9 temp commit 2019-09-05 16:02:20 +03:00
Haelwenn fe7cf44c40 Merge branch 'feature/mastoapi-accounts-external' into 'develop'
Mastdon API: Add ability to get a remote account by nickname to `/api/v1/accounts/:id`

See merge request pleroma/pleroma!1622
2019-09-05 12:48:27 +00:00
rinpatch 26fe6f70c9 Move checking for restrict_local to User.get_cached_by_id_or_nickname 2019-09-05 15:39:10 +03:00
rinpatch 9d4fc9aa35 Merge branch 'fix/endless-poll-handling' into 'develop'
Mastodon API Poll view: Fix handling of polls without an end date

See merge request pleroma/pleroma!1631
2019-09-05 09:11:16 +00:00
rinpatch b312ca3d52 Mastodon API Poll view: Fix handling of polls without an end date 2019-09-05 12:03:39 +03:00
rinpatch 3e30f6e198 Merge branch 'fix/safe-render-notifications' into 'develop'
Do not crash if one notification failed to render

See merge request pleroma/pleroma!1630
2019-09-05 05:47:06 +00:00
rinpatch 558969a0fd Do not crash if one notification failed to render 2019-09-05 08:32:49 +03:00
rinpatch 3b8d64ee24 Merge branch 'dockerfile-touchups' into 'develop'
Update Dockerfile + some touchups to docker.exs

See merge request pleroma/pleroma!1624
2019-09-04 20:22:41 +00:00
Ashlynn Anderson 053b17f57e Switch to alpine:3.9 to avoid dlsym errors 2019-09-04 14:56:26 -04:00
Haelwenn e72531bfac Merge branch 'feat/mastoapi-status-threadmuted' into 'develop'
Mastodon API: Add `pleroma.thread_muted` to Status entity

See merge request pleroma/pleroma!1626
2019-09-04 11:26:34 +00:00
rinpatch 3face45467 Mastodon API: Add `pleroma.thread_muted` to Status entity
Needed for pleroma-fe!941
2019-09-04 14:17:23 +03:00
Haelwenn e54694748b Merge branch 'feature/mastoapi-read-notifications' into 'develop'
Extend `/api/pleroma/notifications/read` to mark multiple notifications as read and make it respond with Mastoapi entities

See merge request pleroma/pleroma!1625
2019-09-04 10:46:49 +00:00
rinpatch 328b2612cd Clarify that read notifications are returned 2019-09-04 13:39:39 +03:00
rinpatch 377aa9fb90 Apply suggestion to docs/api/pleroma_api.md 2019-09-04 10:37:43 +00:00
rinpatch 7c3838090f Apply suggestion to lib/pleroma/notification.ex 2019-09-04 10:14:15 +00:00
rinpatch c2b6c1b089 Extend `/api/pleroma/notifications/read` to mark multiple notifications
as read and make it respond with Mastoapi entities
2019-09-04 12:38:27 +03:00
rinpatch cc1d1ee406 Mastdon API: Add ability to get a remote account by nickname to
`/api/v1/accounts/:id`
2019-09-03 19:26:10 +03:00
Ashlynn Anderson 4b422b5469 Switch to official elixir:1.9-alpine image for build 2019-09-03 11:44:57 -04:00
Ashlynn Anderson bd8b92ea5e Remove dynamic config as default, add healthcheck 2019-09-03 09:31:52 -04:00
rinpatch 46ffd8b3b6 Merge branch 'feature/pagination-total' into 'develop'
Return total items count from pagination + tests

See merge request pleroma/pleroma!1620
2019-09-03 13:03:06 +00:00
Maxim Filippov b15cfd80ef Return "total" optionally 2019-09-03 13:58:27 +03:00
Maxim Filippov a4c5f71e93 Return total from pagination + tests 2019-09-02 22:48:52 +03:00
feld 6d33c89c4d Merge branch 'iss-930-media' into 'develop'
Fix missing changes in pleroma/pleroma!1197

See merge request pleroma/pleroma!1613
2019-08-30 15:23:15 +00:00
kPherox 99b4847da3
Fix missing changes in pleroma/pleroma!1197 2019-08-30 21:00:50 +09:00
kaniini a7202b52e0 Merge branch 'fix/antifollowbot-and-relays' into 'develop'
Fix AntiFollowbotPolicy when trying to follow a relay

Closes #1231

See merge request pleroma/pleroma!1610
2019-08-30 00:38:03 +00:00
feld 7853b3f17d Fix AntiFollowbotPolicy when trying to follow a relay 2019-08-30 00:38:03 +00:00
Haelwenn d9d7765383 Merge branch 'fix-osada-follow' into 'develop'
Transmogrifier: Fix follow handling when the actor is an object.

Closes #1211

See merge request pleroma/pleroma!1604
2019-08-28 07:10:35 +00:00
lain 66519f2100 Merge branch 'list-controller' into 'develop'
Extract list actions from `MastodonAPIController` into `ListController`

See merge request pleroma/pleroma!1600
2019-08-27 21:15:54 +00:00
lain 96de84a93d Merge branch 'tests/activity_pub' into 'develop'
added tests for ActivityPub.like\unlike

See merge request pleroma/pleroma!1606
2019-08-27 20:59:09 +00:00
Maksim ffcd742aa0 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex 2019-08-27 17:37:19 +00:00
lain c30cc039e4 Transmogrifier: Use Containment.get_actor to get actors. 2019-08-27 12:22:30 -05:00
Maksim Pechnikov 00abe099cd added tests for ActivityPub.like\unlike 2019-08-27 16:21:03 +03:00
lain ba5e14be05 Merge branch 'fix-typo' into 'develop'
Fix typo

See merge request pleroma/pleroma!1603
2019-08-26 19:37:24 +00:00
lain 3da65292b3 Transmogrifier: Fix follow handling when the actor is an object. 2019-08-26 14:34:52 -05:00
Egor Kislitsyn fd076def0a Fix typo 2019-08-27 02:24:14 +07:00
rinpatch 3da278375d Merge branch 'fix/sporadic-test' into 'develop'
Fix sporadic test

Closes #1221

See merge request pleroma/pleroma!1602
2019-08-26 14:44:11 +00:00
Maxim Filippov c338224c93 Fix sporadic test 2019-08-26 17:24:22 +03:00
kaniini 8c7b1c076c Merge branch 'disable-rate-limiter' into 'develop'
Disable rate limiter by default

Closes #1217

See merge request pleroma/pleroma!1601
2019-08-26 14:01:51 +00:00
Egor Kislitsyn 66c1966688 Disable rate limiter by default 2019-08-26 20:36:44 +07:00
Egor Kislitsyn 019ced0558 Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers and test/web/mastodon_api/views 2019-08-26 19:37:57 +07:00
Egor Kislitsyn 4194abbc8f Move mastodon_api/*_controller.ex to mastodon_api/controllers/ 2019-08-26 19:37:57 +07:00
Egor Kislitsyn 30510ade0e Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests 2019-08-26 19:37:54 +07:00
Egor Kislitsyn 4d82bc8b0b Extract MastodonAPI.MastodonAPIController.errors/2 to MastodonAPI.FallbackController 2019-08-26 19:16:40 +07:00
Egor Kislitsyn 3b1b631c2a Add validation in Pleroma.List.create/2 2019-08-26 18:59:57 +07:00
kaniini 6dc24422dc Merge branch 'issue/1177' into 'develop'
[#1177] fixed unfollow for relay actor

See merge request pleroma/pleroma!1589
2019-08-25 19:43:27 +00:00
kaniini 897bd7a15e Merge branch 'feature/moderation-log' into 'develop'
Log admin/moderator actions

See merge request pleroma/pleroma!1582
2019-08-25 19:39:37 +00:00
Maxim Filippov 37dd3867bb Log admin/moderator actions 2019-08-25 19:39:37 +00:00