summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-04-22batch mention email notifications in timeframefeature/2295-email-mention-notificationAlexander Strizhakov
2021-04-20Merge branch 'fix/docs' into 'develop'feld
Docs: Fix incorrect shell command See merge request pleroma/pleroma!3396
2021-04-20Fix incorrect shell commandMark Felder
Can't be in /opt/pleroma/bin and then call ./bin/pleroma_ctl :)
2021-04-19Merge branch 'feature/opt-out-of-google-floc' into 'develop'feld
Add opting out of Google FLoC to HTTPSecurityPlug headers Closes #2630 See merge request pleroma/pleroma!3393
2021-04-19Add CHANGELOG entrySean King
2021-04-19Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵Sean King
feature/opt-out-of-google-floc
2021-04-19Merge branch 'fix/tests' into 'develop'feld
Fix tests broken since !3312 See merge request pleroma/pleroma!3395
2021-04-19Fix error response which was breaking tests related to pinned postsMark Felder
2021-04-18Add opting out of Google FLoC to HTTPSecurityPlug headersSean King
2021-04-16Merge branch 'features/ingestion-ecto-tag' into 'develop'rinpatch
TagValidator: New See merge request pleroma/pleroma!3244
2021-04-16Merge branch 'feature/521-pinned-post-federation' into 'develop'rinpatch
Pinned posts federation Closes #521 See merge request pleroma/pleroma!3312
2021-04-16Merge branch 'fix/2593-reading-exported-config-file' into 'develop'rinpatch
Reading the file, instead of config keyword in ReleaseRuntimeProvider Closes #2593 See merge request pleroma/pleroma!3381
2021-04-15Merge branch 'fix/notifsettings-breaking-login' into 'develop'Haelwenn
Enforce user.notification_settings is NOT NULL Closes #2571 See merge request pleroma/pleroma!3386
2021-04-15Merge branch 'develop' into 'fix/notifsettings-breaking-login'feld
# Conflicts: # CHANGELOG.md
2021-04-15Merge branch 'fix/mastodon-interface-docs-link' into 'develop'Haelwenn
Fix Mastodon interface link in documentation, fixes #2622 Closes #2622 See merge request pleroma/pleroma!3391
2021-04-14Fix Mastodon interface linkSean King
2021-04-14Merge branch 'fix/adminapi-concurrent-limiter' into 'develop'feld
Fix ConcurrentLimiter settings via AdminAPI See merge request pleroma/pleroma!3390
2021-04-14Revert guards on string_to_elixir_types/1, remove unnecessary assignment in testMark Felder
2021-04-13Improve string_to_elixir_types/1 with guardsMark Felder
2021-04-13Document fixed ability to save ConcurrentLimiter settings in ConfigDBMark Felder
2021-04-13Add ConcurrentLimiter to module_name?/1 and apply string_to_elixir_types/1 ↵Mark Felder
to search_opts keys during update_or_create/1
2021-04-13Initial test validating the AdminAPI issueMark Felder
2021-04-13Merge branch 'fix/instance-thumbnail-url' into 'develop'Haelwenn
Fix URL to custom instance thumbnail Closes #2611 See merge request pleroma/pleroma!3388
2021-04-13Fix assignment / assertionMark Felder
2021-04-13Validate custom instance thumbnail set via AdminAPI produces correct URLMark Felder
2021-04-09Use URI.merge to prevent concatenating two canonical URLs when a custom ↵Mark Felder
instance thumbnail was uploaded via AdminFE
2021-04-08release runtime provider fix for pathsAlexander Strizhakov
2021-04-05Move tag fixup to object_validatorHaelwenn (lanodan) Monnier
2021-04-01Merge branch 'chore/CHANGELOG' into 'develop'feld
Fix CHANGELOG entry meant for next release See merge request pleroma/pleroma!3387
2021-04-01Fix CHANGELOG entry meant for next releaseMark Felder
2021-04-01Document user login failure fix for NULL notification_settingsMark Felder
2021-04-01Enforce user.notification_settings is NOT NULLMark Felder
2021-04-01object_validators: Mark validate_data as privateHaelwenn (lanodan) Monnier
2021-04-01Insert string-hashtags in PipelineHaelwenn (lanodan) Monnier
Cannot be done in Ecto schemas because only one type is allowed in arrays, and needs to be done before the MRFs.
2021-04-01pipeline_test: Fix usage of %Activity{}Haelwenn (lanodan) Monnier
2021-04-01TagValidator: NewHaelwenn (lanodan) Monnier
2021-04-01Merge branch 'revert-c368bf6d' into 'develop'Haelwenn
Revert "Merge branch 'patch-fix-open-api-spec' into 'develop'" See merge request pleroma/pleroma!3385
2021-04-01Revert "Merge branch 'patch-fix-open-api-spec' into 'develop'"Haelwenn
This reverts merge request !3382
2021-04-01Merge branch 'refactor/object_validator_validate' into 'develop'rinpatch
object_validator: Refactor most of validate/2 to a generic block See merge request pleroma/pleroma!3383
2021-04-01object_validator: Refactor most of validate/2 to a generic blockHaelwenn (lanodan) Monnier
2021-03-31Merge branch 'patch-fix-open-api-spec' into 'develop'rinpatch
OpenAPI: Fix `date-time` being specified as an `integer` in OpenAPI spec (when it should be a `string`) in AccountCreateResponse See merge request pleroma/pleroma!3382
2021-03-31date-times are always stringsMiss Pasture
2021-03-30Merge branch 'upstream/mrf-followbot' into 'develop'feld
Upstream/mrf followbot See merge request pleroma/pleroma!3060
2021-03-30Fix function calls due to module name changeMark Felder
2021-03-30Temp file leaked, oopsMark Felder
2021-03-30Add more details to the cheatsheat for FollowBot MRFMark Felder
2021-03-30Prefer FollowBot naming convention vs FollowbotMark Felder
2021-03-30Document new FollowBot MRFMark Felder
2021-03-30More tests to validate Followbot is behavingMark Felder
2021-03-30Remove Task.async as it is broken here and probably a premature optimization ↵Mark Felder
anyway