summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-01-06Purge last_known_ip when a user is deletedstore-ipAlex Gleason
2021-01-06AdminAPI: return last_known_ip, fixes #1708Alex Gleason
2021-01-06Optionally store user IP addresses, #1708Alex Gleason
2021-01-05Merge branch 'fix/mediaproxy-config-descriptions' into 'develop'feld
Fix proxy and mediaproxy description.exs See merge request pleroma/pleroma!3219
2021-01-05Merge branch 'fix/emoji-encoding' into 'develop'lain
URI.encode custom emojis Closes #2381 See merge request pleroma/pleroma!3235
2021-01-05Add test to validate URLs to custom emojis are properly encodedMark Felder
2021-01-05Add dinosaur gif from https://gifs.ccMark Felder
"Our animations are free to be used to enhance your website."
2021-01-05URI.encode custom emojisMark Felder
2021-01-05Merge branch 'fix/pagination-regression' into 'develop'lain
Do not try to guess which pagination we need by the existence of an :offset param. Closes #2399 See merge request pleroma/pleroma!3230
2021-01-05Merge branch '1526-account-aliases' into 'develop'lain
Resolve "account move from mastodon to pleroma" Closes #1526 See merge request pleroma/pleroma!3233
2021-01-05User: Use ObjectID type to validate also-known-as fieldlain
2021-01-05Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
1526-account-aliases
2021-01-05Merge branch 'pleroma-moderation-log-stuff' into 'develop'lain
AdminAPI: return id for moderation log entries See merge request pleroma/pleroma!3232
2021-01-05Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
pleroma-moderation-log-stuff
2021-01-05AccountControllerTest: Fix test logiclain
2021-01-05Merge branch '2391-async-bugs' into 'develop'Haelwenn
SideEffects.DeleteTest: asyncify. Closes #2391 See merge request pleroma/pleroma!3231
2021-01-04SideEffects.DeleteTest: asyncify.lain
Replace Mock with Mox, mock out Logger.
2021-01-04Add test to validate profile pagination works with keysetMark Felder
2021-01-04Do not try to guess which pagination we need by the existence of an :offset ↵Mark Felder
param. Require explicit request to get offset pagination.
2021-01-01AdminAPI: return id for moderation log entriesAlex Gleason
2020-12-31Merge branch 'fix/reports-ordering' into 'develop'feld
Do not reverse order of reports. We want newest ones sorted to the top. Closes #2364 See merge request pleroma/pleroma!3225
2020-12-31Document reports ordering changeMark Felder
2020-12-31Aliases: refactor validate_also_known_as/1Alex Gleason
2020-12-31Apply 2 suggestion(s) to 1 file(s)Alex Gleason
2020-12-31Ensure newest report is returned first in the listMark Felder
2020-12-31Merge branch 'fix/adminapi-user-status-pagination' into 'develop'feld
Support pagination in AdminAPI for user statuses See merge request pleroma/pleroma!3226
2020-12-31Apply 1 suggestion(s) to 1 file(s)feld
2020-12-30Render AKAs in Actor endpointsAlex Gleason
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-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
generated by cgit v1.2.3 (git 2.44.0) at 2024-05-05 23:59:05 +0000