summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-11-26Tests: Run the daemonlain
2019-11-26CI: Add testing stage for federated tests.lain
2019-11-26Tests: Don't run federated tests by defaultlain
2019-11-26Add federated test infrastructureChris McCord
2019-11-26Merge branch 'fix/prod-syslog-level' into 'develop'feld
Default log level for syslog in prod should also be :warn See merge request pleroma/pleroma!2011
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
Disable rendering AP representation for remote users and objects See merge request pleroma/pleroma!2010
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 ↵feld
'develop' Admin API: list all statuses from a given instance See merge request pleroma/pleroma!1981
2019-11-25Merge branch 'fix/update-reports-old-format' into 'develop'feld
Admin API: Fix error when trying to update reports in the "old" format See merge request pleroma/pleroma!1986
2019-11-25Merge branch 'feature/useragent-override' into 'develop'rinpatch
Add ability to set a custom user-agent string See merge request pleroma/pleroma!2009
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
OTP releases: only set name and distribution type if not set already See merge request pleroma/pleroma!2004
2019-11-22OTP releases: only set name and distribution type if not set alreadyrinpatch
Fixes not being able to run two OTP releases on one machine because of the name conflict.
2019-11-22Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'lain
AdminAPI: Confirm user account, resend confirmation email See merge request pleroma/pleroma!1994
2019-11-22Swap map with eachMaxim Filippov
2019-11-21Merge branch 'list-users' into 'develop'rinpatch
Add CLI list users command See merge request pleroma/pleroma!1990
2019-11-21Add CLI list users commandAlex Schroeder
2019-11-21Merge branch 'revert-5c6c3026' into 'develop'rinpatch
Revert "Merge branch 'patch-1' into 'develop'" See merge request pleroma/pleroma!2002
2019-11-21Merge branch 'fix/mix-task-logging' into 'develop'lain
Allow mix tasks to always run with debug logging See merge request pleroma/pleroma!1997
2019-11-21Revert "Merge branch 'patch-1' into 'develop'"rinpatch
This reverts merge request !1829
2019-11-21Merge branch 'issue/1348' into 'develop'lain
[#1348] excluded invisible actors from gets /api/v1/accounts/:id See merge request pleroma/pleroma!1937
2019-11-21Object: Use inspect to log missing preload.lain
2019-11-21Merge branch 'fix/user-following-count' into 'develop'lain
Fix user.following_count See merge request pleroma/pleroma!2000
2019-11-21Merge branch 'remove-useless-warning' into 'develop'lain
Remove version mismatch warning See merge request pleroma/pleroma!2001
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 ↵Mark Felder
logs belog :warn. Ensure console backend logs in test environment are :warn, but mix tasks run in test env do not run with :debug because it's far too verbose.
2019-11-20Console backend's log format should be prefixed and suffixed with newlines.Mark Felder
This is how upstream does it by default.
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
Fix sporadically failing test Closes #1432 See merge request pleroma/pleroma!1999
2019-11-20Merge branch 'fix-docker-build' into 'develop'lain
Fix failing docker build See merge request pleroma/pleroma!1998
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
Bump fe and sync changelogs See merge request pleroma/pleroma!1996
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
Admin API: Support authentication via `x-admin-token` HTTP header Closes #1430 See merge request pleroma/pleroma!1993
2019-11-19AdminAPI: Confirm user account, resend confirmation emailMaxim Filippov
2019-11-19Support authentication via `x-admin-token` HTTP headerEgor Kislitsyn
2019-11-18Merge branch 'docs/remove_activation_status_endpoint' into 'develop'feld
Remove deprecated endpoint from docs that is fully removed from backend now See merge request pleroma/pleroma!1992
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-03 12:53:02 +0000