aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-12-30Merge remote-tracking branch 'upstream/develop' into aliasesAlex Gleason
2020-12-30Make pagination type conditionalMark Felder
2020-12-30Continue to use ActivityPub.fetch_user_activities/3, make it pass :offsetMark Felder
2020-12-30Support pagination in AdminAPI for user statusesMark Felder
2020-12-30Do not reverse order of reports. We want newest ones sorted to the top.Mark Felder
2020-12-30Merge branch 'deps/crypt-local-fork' into 'develop'lain
Switch to local fork of crypt until upstream fixes ability to build on aarch64 See merge request pleroma/pleroma!3224
2020-12-28Switch to local fork of crypt until upstream fixes ability to build on aarch64Mark Felder
https://github.com/msantos/crypt/pull/8
2020-12-28Merge branch 'revert-b122b6ff' into 'develop'Haelwenn
Revert "Merge branch 'features/hashtag-column' into 'develop'" See merge request pleroma/pleroma!3222
2020-12-28Revert "Merge branch 'features/hashtag-column' into 'develop'"Haelwenn
This reverts merge request !2824
2020-12-28Merge branch 'features/hashtag-column' into 'develop'Haelwenn
Insert text representation of hashtags into object["hashtags"] See merge request pleroma/pleroma!2824
2020-12-28pleroma.database fill_old_hashtags: Add month_limit argumentHaelwenn (lanodan) Monnier
2020-12-28Pleroma.Object/1: take %Object{} as argument insteadHaelwenn (lanodan) Monnier
2020-12-27non condition dir creationAlexander Strizhakov
2020-12-27changelog entryAlexander Strizhakov
2020-12-27not neededAlexander Strizhakov
2020-12-27insreasing test coverage for StealEmojiPolicyAlexander Strizhakov
2020-12-27check dir existence in policyAlexander Strizhakov
2020-12-27Add MRFs to the list of things that may need a soft rebootMark Felder
2020-12-27Mark privateMark Felder
2020-12-27Create dir for EmojiStealPolicy automaticallyMark Felder
2020-12-26Merge branch 'cachex-test' into 'develop'lain
Test framework overhaul (speed, reliability) See merge request pleroma/pleroma!3209
2020-12-23Revert, this is useful in an edge caseMark Felder
2020-12-23FormattingMark Felder
2020-12-23Update descriptions for MediaProxy, remove settings that should not be ↵Mark Felder
exposed in AdminFE
2020-12-23Remove Proxy settings that were not meant to exist under Pleroma.UploadMark Felder
2020-12-23Add test/instance to .gitignoreMark Felder
2020-12-23Merge branch 'update/linkify' into 'develop'lain
Update Linkify to 0.4.1 See merge request pleroma/pleroma!3217
2020-12-23Update Linkify to 0.4.1Mark Felder
Fixes false positive detection of IPv4 addresses
2020-12-23Merge branch 'mergeback/2.2.1' into 'develop'lain
Mergeback/2.2.1 See merge request pleroma/pleroma!3215
2020-12-23Align changeloglain
2020-12-23Merge branch 'stable' into mergeback/2.2.1lain
2020-12-23Merge branch 'release/2.2.1' into 'stable'v2.2.1lain
Release/2.2.1 See merge request pleroma/pleroma!3214
2020-12-23Fixtures: Add application actor fixture.lain
2020-12-23Merge branch 'release/2.2.1' of git.pleroma.social:pleroma/pleroma into ↵lain
release/2.2.1
2020-12-23Update changeloglain
2020-12-23Apply 1 suggestion(s) to 1 file(s)lain
2020-12-23Lintinglain
2020-12-23Update frontendlain
2020-12-22Mix: Update version.lain
2020-12-22Update changeloglain
2020-12-22Report fixes.lain
2020-12-22Mix: Update linkify to 0.4.1lain
2020-12-22[#2301] Quick fix: users with is_discoverable == false (default!) are ↵Ivan Tashkinov
included in search results.
2020-12-22fix for elixir 1.11Alexander Strizhakov
load runtime configs in releases with config provider
2020-12-22SideEffects: fix testlain
2020-12-22User: Remove left-over (wrong) fix.lain
2020-12-22User: Don't allow local users in remote changesetslain
2020-12-22Switch to a fork of Hackney 1.15.2 for now so we can have our URL ↵Mark Felder
normalization bugfix
2020-12-22Update changeloglain
2020-12-22Search: Only skip ordering the rum index.lain
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 10:39:17 +0000