nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
6462 commits 2 branches 0 tags 272 MiB
Commit graph

6462 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ariadne Conill 5effb2cbca activitypub: help ecto build a better query for thread mute filtering 
using an indexed value in thread_mute table helps ecto build a better query.
 2019-09-06 23:11:26 +00:00
rinpatch 130bc8e0d5 Merge branch 'chore/changelog-prioritize-twitterapi-removal' into 'develop' 
Prioritize the removal of TwitterAPI and :accept_blocks in the changelog

See merge request pleroma/pleroma!1638
 2019-09-06 15:29:03 +00:00
rinpatch f92dc82dda Prioritize the removal of TwitterAPI and :accept_blocks in the changelog 2019-09-06 18:28:01 +03:00
rinpatch 896ffabe37 Merge branch 'so-long-twitterapi' into 'develop' 
Removing TwitterAPI

See merge request pleroma/pleroma!1605
 2019-09-06 08:43:38 +00:00
rinpatch d0e0f2380d Merge branch 'update-frontend-e75ac9dd' into 'develop' 
Update frontend bundle to e75ac9dd

See merge request pleroma/pleroma!1635
 2019-09-06 08:41:30 +00:00
rinpatch 16e6be340d Update frontend bundle to e75ac9dd 2019-09-06 11:31:44 +03:00
rinpatch 592ce8a74f Merge branch 'hotifx/emoji-trailing' into 'develop' 
Call TrailingFormatPlug for /api/pleroma/emoji

See merge request pleroma/pleroma!1634
 2019-09-05 19:23:52 +00:00
rinpatch 3523bdcf26 Call TrailingFormatPlug for /api/pleroma/emoji 
Apparently Pleroma-FE still calls it with trailing '.json'
 2019-09-05 22:21: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
rinpatch 70eed0594c credo fixes 2019-08-31 13:08:43 +03:00
rinpatch bd3ed3a622 Add back /api/qvitter/statuses/notifications/read.json 2019-08-31 11:43:06 +03:00
rinpatch 9cabc02864 Remove a useless import 2019-08-31 10:57:35 +03:00
rinpatch dbfcba85ec Add a changelog entry for twitterapi removal and fix credo issues 2019-08-31 10:45:37 +03:00
rinpatch 64410497d2 Remove TwitterAPI representers 2019-08-31 10:41:15 +03:00
rinpatch 2e7bb107e0 Remove Mention of TwitterAPI in readme 2019-08-31 10:37:26 +03:00
rinpatch 985122cc03 Remove Activity, User and Notification views from TwitterAPI 2019-08-31 10:31:15 +03:00
rinpatch 90c2dae9a4 Remove most of Pleroma.Web.TwitterAPI.TwitterAPI 2019-08-31 10:20:34 +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
rinpatch eb1739c596 Remove most of TwitterAPIController 2019-08-27 12:29:19 +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