summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-26Merge branch 'cachex-test' into 'develop'lain
Test framework overhaul (speed, reliability) See merge request pleroma/pleroma!3209
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'lain
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
2020-12-22Activity search: Fix order of resultslain
Greatly speeds up the search for RUM.
2020-12-22Document fixing the pleroma.user delete_activities mix taskMark Felder
2020-12-22Need to start web_resp cache or mix task failsMark Felder
2020-12-22Document S3 and Elixir 1.11 compat fixMark Felder
2020-12-22Fix S3 uploads with Elixir 1.11Mark Felder
2020-12-22pleroma.instance: Fix Exiftool module nameHaelwenn (lanodan) Monnier
2020-12-22remove PurgeExpiredActivity from Oban db configAlexander Strizhakov
2020-12-22Merge branch 'update-elixir-make' into 'develop'feld
Update for retired elixir_make package version See merge request pleroma/pleroma!3211
2020-12-22update for retired elixir_make package versionAlexander Strizhakov
2020-12-22Merge branch 'update/instance-gen-template' into 'develop'rinpatch
Update instance.gen template See merge request pleroma/pleroma!3210
2020-12-22Create Object.hashtags/1 wrapperHaelwenn (lanodan) Monnier
2020-12-22Insert text representation of hashtags into object["hashtags"]Haelwenn (lanodan) Monnier
Includes a new mix task: pleroma.database fill_old_hashtags
2020-12-21Do not include pool_size in the template. It encourages unwanted fiddling :)Mark Felder
2020-12-21Merge branch 'develop' into 'develop'lain
WebFinger: add subscribe_address in return data of JSON responses See merge request pleroma/pleroma!3206
2020-12-21Lintinglain
2020-12-21Tests: Stub the pipeline in all tests.lain
Restores the old un-moxed behavior.