summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-10-12SideEffects: Don't delete a deleted object twice.2232-double-deletelain
2020-10-09Merge branch 'feat/deep-link-account-approval' into 'develop'feld
Deep link to the user account in AdminFE in account confirmation emails See merge request pleroma/pleroma!3065
2020-10-09Deep link to the user account in AdminFE in account confirmation emailsMark Felder
2020-10-09Merge branch 'docs/improve-backup-restore' into 'develop'feld
Spelling See merge request pleroma/pleroma!3063
2020-10-09SpellingMark Felder
2020-10-09Merge branch 'docs/improve-backup-restore' into 'develop'feld
#2219 Improve backup/restore documentation See merge request pleroma/pleroma!3061
2020-10-09Ask user to use matching values for database setupMark Felder
2020-10-08Syntax errorMark Felder
2020-10-08Don't always need to dropMark Felder
2020-10-08Improve backup/restore documentationMark Felder
2020-10-08Merge branch 'fix/2209-remoteip' into 'develop'Haelwenn
#2209 RemoteIP CIDR helper, config and doc improvements See merge request pleroma/pleroma!3057
2020-10-07LintMark Felder
2020-10-07Apply 1 suggestion(s) to 1 file(s)Maksim
2020-10-07Apply 1 suggestion(s) to 1 file(s)Maksim
2020-10-07Apply 2 suggestion(s) to 2 file(s)feld
2020-10-06Improve description yet againMark Felder
2020-10-06Don't leak internal variables in the docs. They're useless to users.Mark Felder
2020-10-06CredoMark Felder
2020-10-06Improve descriptions for reserved and proxiesMark Felder
2020-10-06Add test for an entry without CIDR formatMark Felder
2020-10-06Move hardcoded default configuration into config.exsMark Felder
2020-10-06Fix docs for default headers used by RemoteIp. We only use X-Forwarded-For ↵Mark Felder
by default.
2020-10-06Merge branch 'revert/rich-media-censorship' into 'develop'feld
#2192 Revert Rich Media censorship for sensitive statuses See merge request pleroma/pleroma!3044
2020-10-06Document the NSFW link preview changeMark Felder
2020-10-06Merge branch 'develop' into revert/rich-media-censorshipMark Felder
2020-10-06Merge branch 'filtering-following' into 'develop'rinpatch
ActivityPub: Return Announces when filtering by `following`. See merge request pleroma/pleroma!3022
2020-10-06Merge branch 'feature/update-description-for-frontends-setting' into 'develop'rinpatch
Remove extra nesting and add labels in `:frontends` setting See merge request pleroma/pleroma!3043
2020-10-05Merge branch 'feature/1893-remote-emoji-packs-pagination' into 'develop'feld
Feature/1893 remote emoji packs pagination Closes #1893 See merge request pleroma/pleroma!2698
2020-10-05Merge branch 'develop' into feature/1893-remote-emoji-packs-paginationMark Felder
2020-10-05Add helper function to convert single IPs into CIDR format if they were not ↵Mark Felder
provided that way
2020-10-05Merge branch '2211-smol-documentation-fix' into 'develop'Haelwenn
Docs: Modify docs so the postgres config is harder to get wrong. Closes #2211 See merge request pleroma/pleroma!3055
2020-10-05Docs: Modify docs so the postgres config is harder to get wrong.lain
2020-10-03Merge branch 'fix/empty-params-openapi' into 'develop'rinpatch
OpenAPI CastAndValidate: filter out empty params Closes #2198 See merge request pleroma/pleroma!3047
2020-10-01Merge branch 'web-push-fix' into 'develop'lain
web push http_client fix Closes #2202 See merge request pleroma/pleroma!3052
2020-10-01web push http_client fixAlexander Strizhakov
2020-09-30Merge branch 'chore/pleroma-vcl' into 'develop'feld
Make it possible for Varnish logs to contain the true scheme used by clients See merge request pleroma/pleroma!3051
2020-09-30Syntax errorMark Felder
2020-09-30Make it possible for Varnish logs to contain the true scheme used by clientsMark Felder
instead of always reporting http://
2020-09-30Merge branch 'update/oban' into 'develop'rinpatch
Update Oban to 2.1.0 See merge request pleroma/pleroma!3050
2020-09-30Merge branch '2201-i-hate-this' into 'develop'rinpatch
User search: Once again, change uri handling. Closes #2201 See merge request pleroma/pleroma!3048
2020-09-30Update Oban to 2.1.0Mark Felder
2020-09-30Migrations: Nullify old unique index on users.urilain
2020-09-30User search: Once again, change uri handling.lain
They can indeed be non-unique.
2020-09-30Fix typoAngelina Filippova
2020-09-30Fix comma typoAngelina Filippova
2020-09-29Apply 1 suggestion(s) to 1 file(s)Angelina Filippova
2020-09-29Apply 1 suggestion(s) to 1 file(s)Angelina Filippova
2020-09-29OpenAPI CastAndValidate: filter out empty paramsrinpatch
Closes #2198
2020-09-29Merge branch 'fix/2189-unpin-activity' into 'develop'Haelwenn
#2189 More robust expires_at timestamp processing See merge request pleroma/pleroma!3046
2020-09-29More robust expires_at timestamp processingMark Felder