aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-08-14Update CHANGELOGEgor Kislitsyn
2019-08-14Fix testsEgor Kislitsyn
2019-08-14Add custom profile fieldsEgor Kislitsyn
2019-08-14Merge branch 'backport/describe-api-changelog' into 'develop'rinpatch
Backport the describe API changelog entry to develop See merge request pleroma/pleroma!1564
2019-08-14update changelog to cover MRF describe API.Ariadne Conill
2019-08-14Merge branch 'preload-user-timelines' into 'develop'kaniini
Preload thread mutes/bookmarks in user_statuses See merge request pleroma/pleroma!1563
2019-08-14Merge branch 'get-context-optimizations' into 'develop'kaniini
Preload thread mutes/bookmarks in get_context See merge request pleroma/pleroma!1562
2019-08-14Preload thread mutes/bookmarks in user_statusesrinpatch
2019-08-14Preload thread mutes/bookmarks in get_contextrinpatch
Also removes filtering for creates (was done on the database side already) and filtering for the requested activity (moved to the database side) from application side.
2019-08-13Merge branch 'feature/mrf-vocabulary' into 'develop'rinpatch
MRF Vocabulary See merge request pleroma/pleroma!1559
2019-08-13Merge branch 'feature/mrf-describe' into 'develop'kaniini
MRF describe API See merge request pleroma/pleroma!1561
2019-08-13docs tweakAriadne Conill
2019-08-13Merge branch 'length-limit-bio' into 'develop'rinpatch
Add configurable length limits for `User.bio` and `User.name` See merge request pleroma/pleroma!1515
2019-08-13mrf_vocabulary: add describe API supportAriadne Conill
2019-08-13fix credoAriadne Conill
2019-08-13Merge branch 'fix/mastoapi-more-object-preloads' into 'develop'Haelwenn
Mastodon API: Preloading and normalization optimizations See merge request pleroma/pleroma!1558
2019-08-13tests: fix up nodeinfo testsAriadne Conill
2019-08-13Merge branch 'feature/nicer-safe-render-errors' into 'develop'kaniini
Nicer formatting for safe_render errors See merge request pleroma/pleroma!1560
2019-08-13tests: add tests for MRF.describe()Ariadne Conill
2019-08-14Nicer formatting for safe_render errorsrinpatch
2019-08-13nodeinfo: use MRF.describe() instead of hardcoded MRF transparency stuffAriadne Conill
2019-08-13MRF: add describe() to all modules, add base MRF configuration to base ↵Ariadne Conill
describe()
2019-08-13test: add mock MRF module for describe() testingAriadne Conill
2019-08-13MRF: add describe() for gathering and describing the MRF configurationAriadne Conill
2019-08-13Merge branch 'test/web_activity_pub_relay' into 'develop'kaniini
tests for Web/ActivityPub/Relay See merge request pleroma/pleroma!1557
2019-08-13tests for Web/ActivityPub/RelayMaksim
2019-08-13Merge branch 'test/web_mastodon_api' into 'develop'kaniini
tests for /web/mastodon_api/mastodon_api.ex See merge request pleroma/pleroma!1554
2019-08-13tests for /web/mastodon_api/mastodon_api.exMaksim
2019-08-13update changelog for mrf_vocabularyAriadne Conill
2019-08-13tests: add tests for mrf_vocabularyAriadne Conill
2019-08-13docs: document mrf_vocabulary module settingsAriadne Conill
2019-08-13MRF: add vocabulary policy moduleAriadne Conill
2019-08-13Mastodon API: Preloading and normalization optimizationsrinpatch
- Try to normalize the activity instead of object wherever possible - Put the `user` key on non-home timelines as well so bookmarks and thread mutes are preloaded there as well - Skip trying to get the user when rendering mentions if the id == as:Public or user's follower collection - Preload the object when getting replied to activities and do not crash if it's not present This almost solves the problem of Pleroma hammering the db with a lot of queries when rendering timelines, the things left are 1. When rendering mentions and the user is not in cache, save it for later and request all uncached users in one go 2. Somehow get rid of needing to get the latest follow activity to detect the value of `requested` in a relationship. (create a database view for user relationship and cache it maybe?)
2019-08-13Merge branch 'feature/remove-disable-blocks' into 'develop'kaniini
config: remove legacy activitypub accept_blocks setting See merge request pleroma/pleroma!1556
2019-08-13config: remove legacy activitypub accept_blocks settingAriadne Conill
Anyone who is interested in dropping blocks can write their own MRF policy at this point. This setting predated the MRF framework. Disabling the side effect (unsubscription) is still a config option per policy.
2019-08-12Merge branch 'update/admin-fe' into 'develop'rinpatch
Update AdminFE See merge request pleroma/pleroma!1555
2019-08-12Update AdminFEMark Felder
Now permits server configuration. Consider this ALPHA.
2019-08-12Modify Changelog.lain
2019-08-12ConversationView: Align parameter names with other views.lain
2019-08-12Conversation: Add endpoint to get a conversation by id.lain
2019-08-12Conversations: Use 'recipients' for accounts in conversation view.lain
According to gargron, this is the intended usage.
2019-08-11Merge branch 'chore/changelog-update' into 'develop'rinpatch
Add a changelog entry for !1552 See merge request pleroma/pleroma!1553
2019-08-11Add a changelog entry for !1552rinpatch
2019-08-11Merge branch 'fix/fix-type-depth' into 'develop'rinpatch
Do not fetch the reply object in `fix_type` unless the object has the `name` key and use a depth limit when fetching it See merge request pleroma/pleroma!1552
2019-08-11Do not fetch the reply object in `fix_type` unless the object has therinpatch
`name` key and use a depth limit when fetching it
2019-08-10Merge branch 'fix/mrf-subdomain-case-insensitive' into 'develop'kaniini
MRF: ensure that subdomain_match calls are case-insensitive See merge request pleroma/pleroma!1550
2019-08-10MRF: ensure that subdomain_match calls are case-insensitiveAriadne Conill
2019-08-10Merge branch 'fix/hide-follows-counters' into 'develop'kaniini
Mastodon API: Set follower/following counters to 0 when hiding followers/following is enabled See merge request pleroma/pleroma!1544
2019-08-10Merge branch 'develop' into 'fix/hide-follows-counters'kaniini
# Conflicts: # CHANGELOG.md
2019-08-10Merge branch 'fix/crash-favourited-by-ordered-collections' into 'develop'kaniini
Strip internal fields including likes from incoming and outgoing activities Closes #1159 See merge request pleroma/pleroma!1533