aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2022-01-11mix.lock: sync with mix.exsrinpatch
2022-01-11Add 2.4.2 changelog entry and bump mix versionrinpatch
2022-01-11Merge branch 'fix/rich-media-test-escape-unicrud' into 'develop'Alex Gleason
2022-01-11Merge branch 'pleroma-result-1_13' into 'develop'lain
2022-01-10Merge remote-tracking branch 'origin/develop' into account-endorsementsmarcin mikołajczak
2022-01-10Merge branch 'fix/rich-media-test-escape-unicrud' into 'develop'Alex Gleason
2022-01-10Escape unicode RTL overrides in rich media parser testsrinpatch
2022-01-10Merge branch 'update-hackney' into 'develop'lain
2022-01-07Merge branch 'api-docs-fixes' into 'develop'Alex Gleason
2022-01-07Docs: fix various Pleroma API endpoints paths, fix MFA responseAlex Gleason
2022-01-02Merge branch 'change/web-push-encryption-dep' into 'develop'Alex Gleason
2022-01-01Upgrade web_push_encryption to 0.3.1Sean King
2022-01-01Merge branch 'change/concurrent-limiter-dep' into 'develop'Alex Gleason
2022-01-01Change concurrent_limiter to Hex PM version 0.1.1Sean King
2021-12-31Merge branch 'erratic-streamer-test' into 'develop'Alex Gleason
2021-12-31StreamerTest: tag erratic testAlex Gleason
2021-12-30Merge more stuff from upstream develop branchSean King
2021-12-30Merge branch 'more-efficient-ci' into 'develop'lain
2021-12-29Fix merge conflict in CHANGELOG.mdSean King
2021-12-29Merge branch 'chore/user-relationships-target-id-rel-type-index' into 'develop'lain
2021-12-29`mix format`Ivan Tashkinov
2021-12-29Added index on [:target_id, :relationship_type] to :user_relationships (speed...Ivan Tashkinov
2021-12-28Merge branch 'changelog' into 'develop'Alex Gleason
2021-12-28Update CHANGELOG.mdAlex Gleason
2021-12-28Merge branch 'mastodon-lookup' into 'develop'Alex Gleason
2021-12-28AccountController.lookup: skip authmarcin mikołajczak
2021-12-28AccountController.lookup: skip visibility checkmarcin mikołajczak
2021-12-28wipmarcin mikołajczak
2021-12-28Merge remote-tracking branch 'pleroma/develop' into mastodon-lookupmarcin mikołajczak
2021-12-28MastoAPI: Add `GET /api/v1/accounts/lookup`marcin mikołajczak
2021-12-28Merge branch 'apps-api-endpoint' into 'develop'Alex Gleason
2021-12-28Deal with target not found error in add_aliasTusooa Zhu
2021-12-28Test that the target account is re-fetched in move_accountTusooa Zhu
2021-12-28Make move_account endpoint process non-existent users properlyTusooa Zhu
2021-12-28Make move_following worker follow then unfollowTusooa Zhu
2021-12-28Federate unfollow activity in move_following properlyTusooa Zhu
2021-12-28Make Move activity federate properlyTusooa Zhu
2021-12-28Document aliases endpointsTusooa Zhu
2021-12-28Add deleting alias endpointTusooa Zhu
2021-12-28Add get and add aliases endpointsTusooa Zhu
2021-12-28Add User.add_alias/2 and User.alias_users/1Tusooa Zhu
2021-12-28Add changelogTusooa Zhu
2021-12-28Document move_account APITusooa Zhu
2021-12-28Implement moving accountTusooa Zhu
2021-12-28Merge branch 'ensure-staff-privileged-strict' into 'develop'Alex Gleason
2021-12-27PleromaAPI.AppView: add testAlex Gleason
2021-12-27AppController: remove unnecessary `require Logger`Alex Gleason
2021-12-27Apps: add test for get_user_apps/1Alex Gleason
2021-12-27AppController: test creating with and without a userAlex Gleason
2021-12-27Apps: add user_id indexAlex Gleason