aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2019-10-15DELETE /api/pleroma/admin/users now accepts nicknames arrayMaxim Filippov
2019-10-15Store status data inside flag activityMaxim Filippov
2019-10-15don't stream in benchmark envAlexander
2019-10-15Add `Sec-WebSocket-Protocol` to response headerkPherox
2019-10-15For pleroma.emoji downloaded packs, generate pack.json insteadEkaterina Vaartis
2019-10-14Do not add `follower_address` to `following` for non local usersEgor Kislitsyn
2019-10-14Mastodon API: Add `exclude_visibilities` parameter to the timeline and ↵eugenijm
notification endpoints
2019-10-13Merge branch 'incoming-id-fixes' into 'develop'lain
Assorted transmogrifier fixes See merge request pleroma/pleroma!1831
2019-10-11Make MediaProxy failure tracking less brutalrinpatch
The current failure tracking mechanism will never request anything that didn't respond with a success, 403, 404, or 5xx codes. This is causing issues when using in real fediverse because of weird status codes some software has and timeouts being frequent. This patch changes failure tracking mechanism to only never request the url again if it responded with 400, 204, or the body is too large, otherwise it can be re-requested in 60 seconds.
2019-10-11Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relaysMaxim Filippov
2019-10-11Merge branch 'develop' into feature/multiple-users-activation-permissionsMaxim Filippov
2019-10-11Deprecate POST/DELETE ↵Maxim Filippov
/api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
2019-10-11Ostatus DeleteHandler: Fix for new option format.lain
2019-10-11Transmogrifier: Correctly save incoming ids for Accept/Reject.lain
2019-10-11Transmogrifier: Actually store who deleted a note.lain
2019-10-11Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of ↵Maxim Filippov
deleting it
2019-10-11Replace `user.following` with Pleroma.FollowingRelationshipEgor Kislitsyn
2019-10-10Transmogrifier: Save correct ids for incoming deletes.lain
2019-10-10Merge remote-tracking branch 'origin/develop' into benchmark-finishinglain
2019-10-10Merge branch 'develop' into 'reactions'lain
# Conflicts: # CHANGELOG.md
2019-10-10Merge branch 'develop' into feature/reports-groups-and-multiple-state-updateMaxim Filippov
2019-10-09Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop'lain
Add `pleroma.direct_conversation_id` to `GET /api/v1/statuses/:id` See merge request pleroma/pleroma!1822
2019-10-09Ability to toggle activation status and permission group for a group of usersMaxim Filippov
2019-10-09Add a task to re-count statuses for all usersEgor Kislitsyn
2019-10-09Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status ↵eugenijm
(`GET /api/v1/statuses/:id`)
2019-10-07Line is too long!Maxim Filippov
2019-10-07Merge branch 'develop' into feature/reports-groups-and-multiple-state-updateMaxim Filippov
2019-10-07Admin API: Reports, grouped by statusMaxim Filippov
2019-10-07Merge branch 'develop' into 'reactions'lain
# Conflicts: # CHANGELOG.md
2019-10-07mastodon api: fix exclude_replies (closes #1287)Ariadne Conill
2019-10-07Extract RSS Feed functionality from OStatusSergey Suprunenko
2019-10-07Linting.lain
2019-10-07Merge remote-tracking branch 'origin/develop' into reactionslain
2019-10-07Merge branch 'mrf/simple_policy/check_actor' into 'develop'kaniini
mrf/simple_policy: check actor against accept/reject See merge request pleroma/pleroma!1806
2019-10-07Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1260-rate-limited-auth-actions # Conflicts: # CHANGELOG.md
2019-10-07Merge branch 'misskey-compat' into 'reactions'lain
Transmogrifier: Handle misskey likes with reactions like EmojiReactions. See merge request pleroma/pleroma!1783
2019-10-07Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'Haelwenn
[#1234] Mastodon 2.4.3 hierarchical OAuth scopes Closes #1234 See merge request pleroma/pleroma!1643
2019-10-07mrf/simple_policy: check actor against accept/rejectHaelwenn (lanodan) Monnier
2019-10-06Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop'kaniini
Move local keys out of `user.info` See merge request pleroma/pleroma!1799
2019-10-06Use the user.id instead of nickname in report URLsfeld
Ensures links to profiles of remote users work.
2019-10-06[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1234-mastodon-2-4-3-oauth-scopes # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex
2019-10-06Move local keys out of `user.info`rinpatch
2019-10-06Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1234-mastodon-2-4-3-oauth-scopes # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/account_controller.ex # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex
2019-10-06Merge branch 'develop' into 'reactions'lain
# Conflicts: # CHANGELOG.md
2019-10-06Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1260-rate-limited-auth-actions # Conflicts: # CHANGELOG.md
2019-10-06Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'Haelwenn
Fix custom fields of accounts update credentials See merge request pleroma/pleroma!1597
2019-10-05Merge branch 'split-masto-api/leftovers' into 'develop'kaniini
[#1278] Move a few more actions from MastodonAPIController See merge request pleroma/pleroma!1761
2019-10-05Merge branch 'accept-embedded-announce-object' into 'develop'kaniini
Import object from self-Announce whenever possible See merge request pleroma/pleroma!1770
2019-10-05Merge branch 'unread-conversation-count' into 'develop'kaniini
Add `pleroma.unread_conversation_count` to the Account entity See merge request pleroma/pleroma!1796
2019-10-05Mastodon API: Add `pleroma.unread_conversation_count` to the Account entityeugenijm