summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-01-15Change blocking/blockers queries to use indexblocking-use-indexAlex Gleason
2022-01-14Merge branch 'show_blockers_visible' into 'develop'Alex Gleason
Add blockers_visible to features list when it's enabled See merge request pleroma/pleroma!3603
2022-01-14Add blockers_visible to features list when it's enabledNEETzsche
2022-01-14Merge branch 'mergeback' into 'develop'rinpatch
Merge stable back into develop Closes #2753 See merge request pleroma/pleroma!3602
2022-01-14Merge remote-tracking branch 'origin/stable' into mergebackAlex Gleason
2022-01-13Merge branch 'account-endorsements' into 'develop'Alex Gleason
Account endorsements See merge request pleroma/pleroma!3601
2022-01-12Add more testsmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-12WIP account endorsementsmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-11Merge branch 'release/2.4.2' into 'stable'v2.4.2rinpatch
2.4.2 Release See merge request pleroma/pleroma!3599
2022-01-11CI: Conservatively update release images so they keep building.release/2.4.2Lain Soykaf
2022-01-11CI: Upload the image for all platformsLain Soykaf
For some reason the other platforms started failing, too. This fixes it. Why? Don't know.
2022-01-11Pleroma-FE bundle: update to b13d8f7e6339e877a38a28008630dc8ec64abcdfrinpatch
2022-01-11mix.lock: sync with mix.exsrinpatch
hackney version was bumped in mix.exs, but mix.lock was not updated
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
Escape unicode RTL overrides in rich media parser tests See merge request pleroma/pleroma!3598
2022-01-11Merge branch 'pleroma-result-1_13' into 'develop'lain
move result into with guard See merge request pleroma/pleroma!3557
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
Escape unicode RTL overrides in rich media parser tests See merge request pleroma/pleroma!3598
2022-01-10Escape unicode RTL overrides in rich media parser testsfix/rich-media-test-escape-unicrudrinpatch
Elixir 1.13 does not allow them in raw form anymore, resulting in errors like this when running the test: == Compilation error in file test/pleroma/web/rich_media/parser_test.exs == ** (SyntaxError) test/pleroma/web/rich_media/parser_test.exs:136:45: invalid bidirectional formatting character in string: \u202C. If you want to use such character, use it in its escaped \u202C form instead
2022-01-10Merge branch 'update-hackney' into 'develop'lain
Mix: upgrade Hackney to 1.18.0 Closes #2753 See merge request pleroma/pleroma!3549
2022-01-07Merge branch 'api-docs-fixes' into 'develop'Alex Gleason
Docs: fix various Pleroma API endpoints paths, fix MFA response See merge request pleroma/pleroma!3596
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
Upgrade web_push_encryption to 0.3.1 See merge request pleroma/pleroma!3592
2022-01-01Upgrade web_push_encryption to 0.3.1Sean King
2022-01-01Merge branch 'change/concurrent-limiter-dep' into 'develop'Alex Gleason
Change concurrent_limiter to version 0.1.1 See merge request pleroma/pleroma!3591
2022-01-01Change concurrent_limiter to Hex PM version 0.1.1Sean King
2021-12-31Merge branch 'erratic-streamer-test' into 'develop'Alex Gleason
StreamerTest: tag erratic test See merge request pleroma/pleroma!3590
2021-12-31StreamerTest: tag erratic testAlex Gleason
2021-12-30Merge branch 'more-efficient-ci' into 'develop'lain
CI: Use own package as base See merge request pleroma/pleroma!3577
2021-12-29Merge branch 'chore/user-relationships-target-id-rel-type-index' into 'develop'lain
Added index on [:target_id, :relationship_type] to :user_relationships See merge request pleroma/pleroma!3588
2021-12-29`mix format`Ivan Tashkinov
2021-12-29Added index on [:target_id, :relationship_type] to :user_relationships ↵Ivan Tashkinov
(speeds up `Notification.exclude_blockers/_`).
2021-12-28Merge branch 'changelog' into 'develop'Alex Gleason
Update CHANGELOG.md See merge request pleroma/pleroma!3586
2021-12-28Update CHANGELOG.mdAlex Gleason
2021-12-28Merge branch 'mastodon-lookup' into 'develop'Alex Gleason
MastoAPI: Add `GET /api/v1/accounts/lookup` See merge request pleroma/pleroma!3584
2021-12-28AccountController.lookup: skip authmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-28AccountController.lookup: skip visibility checkmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-28wipmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-28Merge remote-tracking branch 'pleroma/develop' into mastodon-lookupmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-28MastoAPI: Add `GET /api/v1/accounts/lookup`marcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-28Merge branch 'apps-api-endpoint' into 'develop'Alex Gleason
Apps API endpoint See merge request pleroma/pleroma!3583
2021-12-28Merge branch 'ensure-staff-privileged-strict' into 'develop'Alex Gleason
EnsureStaffPrivilegedPlug: don't let non-moderators through See merge request pleroma/pleroma!3582
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
2021-12-27Merge remote-tracking branch 'origin/develop' into apps-api-endpointAlex Gleason
2021-12-27EnsureStaffPrivilegedPlug: don't let non-moderators throughAlex Gleason
2021-12-27Merge branch 'admin-fix-duplicated-endpoints' into 'develop'Alex Gleason
AdminAPI: fix duplicated routes See merge request pleroma/pleroma!3581
generated by cgit v1.2.3 (git 2.44.0) at 2024-04-20 13:20:10 +0000