aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-03-12Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
feature/object-hashtags-rework
2021-03-11Merge branch 'improve-gitlab-ci' into 'develop'rinpatch
Execute mix deps.get earlier and avoid duplicate invocations if possible See merge request pleroma/pleroma!3369
2021-03-11Execute mix deps.get earlier and avoid duplicate invocations if possibleMark Felder
2021-03-11Leverage function pattern matching insteadMark Felder
2021-03-10Workaround for URI.merge/2 bug ↵Mark Felder
https://github.com/elixir-lang/elixir/issues/10771 If we avoid URI.merge unless we know we need it we reduce the edge cases we could encounter. The site would need to both have "//" in the %URI{:path} and the image needs to be a relative URL.
2021-03-10Merge branch 'fix/spec-build' into 'develop'feld
Ensure we fetch deps during spec-build stage See merge request pleroma/pleroma!3368
2021-03-10Revert "See if switching to same image as releases fixes the build"Mark Felder
This reverts commit 502d166b7e44e36a94974df4770de6c6a239ad75.
2021-03-10See if switching to same image as releases fixes the buildMark Felder
2021-03-10Ensure we fetch deps during spec-build stageMark Felder
2021-03-10Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
feature/object-hashtags-rework
2021-03-10Merge branch 'openapi/admin/user' into 'develop'Haelwenn
Add OpenAPI spec for AdminAPI.UserController See merge request pleroma/pleroma!3355
2021-03-07Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
feature/object-hashtags-rework
2021-03-07[#3213] Performance optimization of filtering by hashtags ("any" condition).Ivan Tashkinov
2021-03-05Make tests use itMark Felder
2021-03-05Add simple way to decode fully qualified mediaproxy URLsMark Felder
2021-03-05Update OpenApiSpex dependencyEgor Kislitsyn
2021-03-04Add UserOperation to RedocEgor Kislitsyn
2021-03-03[#3213] ActivityPub hashtags filtering refactoring. Test fix.Ivan Tashkinov
2021-03-03Merge branch 'mergeback/2.3.0' into 'develop'lain
Mergeback/2.3.0 See merge request pleroma/pleroma!3360
2021-03-03Changelog: Re-add application supportlain
2021-03-03Revert "StatusController: Deactivate application support for now."lain
This reverts commit 024c11c18d289d4acd65d749f939ad3684f31905.
2021-03-03Changelog, mix: merge in stablelain
2021-03-03Merge branch 'fix-migration' into 'develop'Haelwenn
Fix migration in cases where database name has a hyphen See merge request pleroma/pleroma!3359
2021-03-02Fix migration in cases where database name has a hyphenMark Felder
2021-03-02Merge branch 'fix/inconsistent-reference' into 'develop'Haelwenn
MastoAPI Status View: make consistently named object references See merge request pleroma/pleroma!3358
2021-03-02Merge branch 'fix/useless-header' into 'develop'Haelwenn
Test: remove useless header on the get request See merge request pleroma/pleroma!3357
2021-03-02Make the object reference in both render("show.json", _) functions ↵Mark Felder
consistently named
2021-03-02Remove useless header on the get requestMark Felder
2021-03-02Merge branch 'release/2.3.0' into 'stable'lain
Release/2.3.0 See merge request pleroma/pleroma!3354
2021-03-02Merge branch 'application-to-generator' into 'develop'feld
Status application field: test improvements See merge request pleroma/pleroma!3356
2021-03-02Actually test viewing status after ingestionMark Felder
2021-03-02Test both ingestion of post in the status controller and the correct ↵Mark Felder
response during the view
2021-03-02Fix build_application/1 matchMark Felder
2021-03-02Add OpenAPI spec for AdminAPI.UserControllerEgor Kislitsyn
2021-03-02Mix: Update linkify.v2.3.0lain
2021-03-02Linting.lain
2021-03-02Changelog: Remove application support line.lain
2021-03-02StatusController: Deactivate application support for now.lain
Some more things to discuss about, so we'll remove it from 2.3.0
2021-03-02Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
feature/object-hashtags-rework
2021-03-01Mix: Update version numberlain
2021-03-01Update changeloglain
2021-03-01Document user agent leak fixMark Felder
2021-03-01user_agent_mock --> request_mockAlex Gleason
2021-03-01Never forward the client's user-agent through the media proxyAlex Gleason
2021-03-01Merge branch 'update-frontend-2021-03-01' into 'develop'lain
Update frontend See merge request pleroma/pleroma!3353
2021-03-01Update frontendlain
2021-03-01Merge branch 'application-to-generator' into 'develop'Haelwenn
ActvitityStreams application field should be called "generator" See merge request pleroma/pleroma!3352
2021-03-01Store application details in the object under the generator key, not ↵Mark Felder
application key
2021-02-28Merge branch 'feld-develop-patch-26755' into 'develop'feld
Update CHANGELOG.md See merge request pleroma/pleroma!3351
2021-02-28Update CHANGELOG.mdfeld
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 05:08:32 +0000