Commit Graph

8665 Commits (80ca06227a47140d527e901a83408a63ce46b144)
 

Author SHA1 Message Date
Ivan Tashkinov 81f1c6bc47 [#1335] Added CHANGELOG.md entry.
5 years ago
Ivan Tashkinov 4f88b1b435 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
lain 937d6c6b32 Merge branch 'fix/sporadic-tests' into 'develop'
5 years ago
Ivan Tashkinov de892d2fe1 [#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
5 years ago
lain 75efdb0781 Merge branch 'fix-docker-build' into 'develop'
5 years ago
Ivan Tashkinov 555edd01ab [#1335] User AP ID relations fetching performance optimizations.
5 years ago
Egor Kislitsyn 63711258ce
Fix sporadically failing test
5 years ago
Mark Felder cb513a599c Allow test builds to have info and debug logs stripped
5 years ago
Mark Felder ff9133b978 Allow mix tasks to always run with debug logging
5 years ago
rinpatch 27f73d38c0 Merge branch 'chore/bump-fe' into 'develop'
5 years ago
rinpatch dc8830da27 changelog: add 1.1.6 entries from stable
5 years ago
rinpatch 0fe08346db bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7
5 years ago
Ivan Tashkinov 565f261338 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Ivan Tashkinov ba5cc30165 [#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
5 years ago
rinpatch 0ba3f1ffb2 Merge branch 'release/1.1.6' into 'stable'
5 years ago
Maksim Pechnikov 1fcd579b6d benchmarks/ added favourites timeline
5 years ago
Maksim Pechnikov 708fd234bd fix order favorites activites
5 years ago
rinpatch 34206e4d7f changelog: fix wrong header levels
5 years ago
rinpatch c2e9c1c8a5 bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7
5 years ago
rinpatch b24b848057 mix.exs: bump version to 1.1.6
5 years ago
rinpatch 5386d1f49f UserEnabledPlug: fix test after backporting
5 years ago
rinpatch 957fb059df Add a changelog entry for email confirmation fix
5 years ago
lain 4079ed3b75 OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug
5 years ago
lain 5b5f855237 UserEnabledPlug: Don't authenticate unconfirmed users.
5 years ago
rinpatch ff4af8c5ee User: Don't let deactivated users authenticate.
5 years ago
rinpatch 3527a03e58 Add a changelog entry for oauth authorize fix
5 years ago
AkiraFukushima df22197755 Check client and token in GET /oauth/authorize
5 years ago
rinpatch b74f4260ae Fix rendering conversations when there's a malformed status
5 years ago
kPherox b7bbb5445d
remove docs/ from .dockerignore
5 years ago
Maxim Filippov b88dbc17c8 Fix tests
5 years ago
lain bf89e0bf38 Merge branch 'feature/admin-api/support-token-header' into 'develop'
5 years ago
Maxim Filippov 46eb160135 AdminAPI: Confirm user account, resend confirmation email
5 years ago
Egor Kislitsyn 36686f5245
Support authentication via `x-admin-token` HTTP header
5 years ago
Maksim Pechnikov 7d727dbfec added test
5 years ago
Maksim Pechnikov 5cee51fac5 fix `order by` for fetch_favorites
5 years ago
Ivan Tashkinov 3aaf3aa2c2 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Ivan Tashkinov aad6576130 [#1335] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.
5 years ago
feld 06151776c0 Merge branch 'docs/remove_activation_status_endpoint' into 'develop'
5 years ago
feld adacf1b5e1 Remove deprecated endpoint from docs that is fully removed from backend now
5 years ago
Maksim Pechnikov 0937895182 updated fetch_favorites
5 years ago
Maksim Pechnikov 9da4c88b49 fix test
5 years ago
Maksim Pechnikov 4beb3ce5c5 /api/v1/favourites: added sorting for activites by adds to favorites
5 years ago
rinpatch 4df2d64b9f Merge branch 'chore/bump-fast-sanitize' into 'develop'
5 years ago
rinpatch fad296e432 Bump fast_sanitize
5 years ago
Maxim Filippov c506cc48ef Admin API: Error when trying to update reports in the "old" format
5 years ago
rinpatch a869c718ab Merge branch 'chore/changelog-sync-' into 'develop'
5 years ago
rinpatch da28bf8fdd Sync the changelogs between develop and stable
5 years ago
kaniini 81cba405af Merge branch 'nodeinfo-fields-limit' into 'develop'
5 years ago
rinpatch 9e3868425a Merge branch 'mix-task-warning' into 'develop'
5 years ago
Ivan Tashkinov 01d9c093c3 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago