summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-11-26remove vim swap filefeature/user-whitelistSadposter
2019-11-26obligatory format commitSadposter
2019-11-26fix relationship view testsSadposter
2019-11-26add whitelist route testsSadposter
2019-11-26add API routes to whitelist/unwhitelistSadposter
2019-11-26add user whitelist relationshipSadposter
2019-11-26Merge branch 'fix/prod-syslog-level' into 'develop'feld
2019-11-26Default log level for syslog in prod should also be :warnMark Felder
2019-11-25Merge branch 'fix/ap-disable-remote-render' into 'develop'lain
2019-11-25OStatus controller: don't serve json at /notice/, redirect insteadrinpatch
2019-11-25ActivityPub controller: do not render remote usersrinpatch
2019-11-25Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'dev...feld
2019-11-25Merge branch 'fix/update-reports-old-format' into 'develop'feld
2019-11-25Merge branch 'feature/useragent-override' into 'develop'rinpatch
2019-11-25move documentation section for http clientSadposter
2019-11-25add ability to set a custom user-agent stringSadposter
2019-11-25Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instanceMaxim Filippov
2019-11-25Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instanceMaxim Filippov
2019-11-23fetcher: move local object checking into a reusable functionrinpatch
2019-11-22Merge branch 'fix/release-envvars' into 'develop'rinpatch
2019-11-22OTP releases: only set name and distribution type if not set alreadyrinpatch
2019-11-22Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'lain
2019-11-22Swap map with eachMaxim Filippov
2019-11-21Merge branch 'list-users' into 'develop'rinpatch
2019-11-21Add CLI list users commandAlex Schroeder
2019-11-21Merge branch 'revert-5c6c3026' into 'develop'rinpatch
2019-11-21Merge branch 'fix/mix-task-logging' into 'develop'lain
2019-11-21Revert "Merge branch 'patch-1' into 'develop'"rinpatch
2019-11-21Merge branch 'issue/1348' into 'develop'lain
2019-11-21Object: Use inspect to log missing preload.lain
2019-11-21Merge branch 'fix/user-following-count' into 'develop'lain
2019-11-21Merge branch 'remove-useless-warning' into 'develop'lain
2019-11-21Remove version mismatch warningEgor Kislitsyn
2019-11-21Fix user.following_countEgor Kislitsyn
2019-11-20Some tasks try to set log level in test environment, but we were stripping lo...Mark Felder
2019-11-20Console backend's log format should be prefixed and suffixed with newlines.Mark Felder
2019-11-20Merge branch 'develop' into fix/mix-task-loggingMark Felder
2019-11-20Be specific about format for logs in test as we have tests that check itMark Felder
2019-11-20Merge branch 'fix/sporadic-tests' into 'develop'lain
2019-11-20Merge branch 'fix-docker-build' into 'develop'lain
2019-11-20Fix sporadically failing testEgor Kislitsyn
2019-11-19Allow test builds to have info and debug logs strippedMark Felder
2019-11-19Allow mix tasks to always run with debug loggingMark Felder
2019-11-19Merge branch 'chore/bump-fe' into 'develop'rinpatch
2019-11-20changelog: add 1.1.6 entries from stablerinpatch
2019-11-19bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7rinpatch
2019-11-20remove docs/ from .dockerignorekPherox
2019-11-19Fix testsMaxim Filippov
2019-11-19Merge branch 'feature/admin-api/support-token-header' into 'develop'lain
2019-11-19AdminAPI: Confirm user account, resend confirmation emailMaxim Filippov