aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-08-14use default child_specsstwf
2019-08-14Merge branch 'fix/revert-tzdata-1.8' into 'develop'lain
2019-08-14Switch to pre-1.8 version of tzdata.rinpatch
2019-08-14Merge branch 'backport/describe-api-changelog' into 'develop'rinpatch
2019-08-14update changelog to cover MRF describe API.Ariadne Conill
2019-08-14Merge branch 'preload-user-timelines' into 'develop'kaniini
2019-08-14Merge branch 'get-context-optimizations' into 'develop'kaniini
2019-08-14Preload thread mutes/bookmarks in user_statusesrinpatch
2019-08-14Preload thread mutes/bookmarks in get_contextrinpatch
2019-08-13Merge branch 'feature/mrf-vocabulary' into 'develop'rinpatch
2019-08-13Merge branch 'feature/mrf-describe' into 'develop'kaniini
2019-08-13docs tweakAriadne Conill
2019-08-13Merge branch 'length-limit-bio' into 'develop'rinpatch
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
2019-08-13tests: fix up nodeinfo testsAriadne Conill
2019-08-13Merge branch 'feature/nicer-safe-render-errors' into 'develop'kaniini
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 descri...Ariadne Conill
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
2019-08-13tests for Web/ActivityPub/RelayMaksim
2019-08-13Merge branch 'test/web_mastodon_api' into 'develop'kaniini
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
2019-08-13Merge branch 'feature/remove-disable-blocks' into 'develop'kaniini
2019-08-13config: remove legacy activitypub accept_blocks settingAriadne Conill
2019-08-12Merge branch 'update/admin-fe' into 'develop'rinpatch
2019-08-12Update AdminFEMark Felder
2019-08-11Merge branch 'chore/changelog-update' into 'develop'rinpatch
2019-08-11Add a changelog entry for !1552rinpatch
2019-08-11Merge branch 'fix/fix-type-depth' into 'develop'rinpatch
2019-08-11Do not fetch the reply object in `fix_type` unless the object has therinpatch
2019-08-10Merge branch 'fix/mrf-subdomain-case-insensitive' into 'develop'kaniini
2019-08-10MRF: ensure that subdomain_match calls are case-insensitiveAriadne Conill
2019-08-10Merge branch 'fix/hide-follows-counters' into 'develop'kaniini
2019-08-10Merge branch 'develop' into 'fix/hide-follows-counters'kaniini
2019-08-10Merge branch 'fix/crash-favourited-by-ordered-collections' into 'develop'kaniini
2019-08-10Strip internal fields including likes from incoming and outgoing activitiesSergey Suprunenko
2019-08-10Merge branch 'test/pleroma_uploaders' into 'develop'kaniini
2019-08-10tests for Pleroma.UploadersMaksim
2019-08-10Merge branch 'fix/mastoapi-threadmute-detection' into 'develop'kaniini