aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-11-20[#1335] User AP ID relations fetching performance optimizations.Ivan Tashkinov
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-19Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations
2019-11-19[#1335] Implemented notification mutes and reblog mutes as ↵Ivan Tashkinov
UserRelationships. User to UserRelationship relations and functions refactoring.
2019-11-19Merge branch 'release/1.1.6' into 'stable'v1.1.6rinpatch
Release/1.1.6 See merge request pleroma/pleroma!1995
2019-11-19benchmarks/ added favourites timelineMaksim Pechnikov
2019-11-19fix order favorites activitesMaksim Pechnikov
2019-11-19changelog: fix wrong header levelsrinpatch
2019-11-19bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7rinpatch
2019-11-19mix.exs: bump version to 1.1.6rinpatch
2019-11-19UserEnabledPlug: fix test after backportingrinpatch
We didn't get rid of user info on stable yet
2019-11-19Add a changelog entry for email confirmation fixrinpatch
2019-11-19OAuthPlug, Router: Handle deactivated users in the UserEnabledPluglain
2019-11-19UserEnabledPlug: Don't authenticate unconfirmed users.lain
2019-11-19User: Don't let deactivated users authenticate.rinpatch
2019-11-19Add a changelog entry for oauth authorize fixrinpatch
2019-11-19Check client and token in GET /oauth/authorizeAkiraFukushima
2019-11-19Fix rendering conversations when there's a malformed statusrinpatch
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-18added testMaksim Pechnikov
2019-11-18fix `order by` for fetch_favoritesMaksim Pechnikov
2019-11-18Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations
2019-11-18[#1335] Refactored UserMute and UserBlock into UserRelationship, introduced ↵Ivan Tashkinov
EctoEnum.
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
2019-11-18Remove deprecated endpoint from docs that is fully removed from backend nowfeld
2019-11-18updated fetch_favoritesMaksim Pechnikov
2019-11-18fix testMaksim Pechnikov
2019-11-18 /api/v1/favourites: added sorting for activites by adds to favoritesMaksim Pechnikov
2019-11-16Merge branch 'chore/bump-fast-sanitize' into 'develop'rinpatch
Bump fast_sanitize See merge request pleroma/pleroma!1988
2019-11-16Bump fast_sanitizerinpatch
2019-11-16Admin API: Error when trying to update reports in the "old" formatMaxim Filippov
2019-11-15Merge branch 'chore/changelog-sync-' into 'develop'rinpatch
Sync the changelogs between develop and stable See merge request pleroma/pleroma!1985
2019-11-16Sync the changelogs between develop and stablerinpatch
2019-11-15Merge branch 'nodeinfo-fields-limit' into 'develop'kaniini
Add fieldsLimit to metadata of nodeinfo See merge request pleroma/pleroma!1983
2019-11-15added recount unread notifications to markersMaksim Pechnikov
2019-11-15Merge branch 'mix-task-warning' into 'develop'rinpatch
Documentation: Add warning about database mix tasks. See merge request pleroma/pleroma!1984
2019-11-15Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations
2019-11-15[#1335] Reorganized `users.mutes` as relation to UserMute entity.Ivan Tashkinov
2019-11-15Add testkPherox
2019-11-15Merge branch 'bugfix/1395-email-activation' into 'develop'rinpatch
Bugfix/1395 email activation Closes #1395 See merge request pleroma/pleroma!1965
2019-11-15Documentation: Add warning about database mix tasks.lain