aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-04These welcome emails are not guaranteed and can be private functionsMark Felder
2021-02-04Merge branch 'develop' into fix/reports-from-adminsMark Felder
2021-02-04Merge branch 'chore/fix-mix-env' into 'develop'feld
Standardize the way we capture and use Mix.env() See merge request pleroma/pleroma!3303
2021-02-04Standardize the way we capture and use Mix.env()Mark Felder
2021-02-04Merge branch 'fix/configdb-error' into 'develop'feld
Improve error message for ConfigDB See merge request pleroma/pleroma!3289
2021-02-04Merge branch 'bugfix/notice-external-redirect' into 'develop'Haelwenn
Redirect non-local activities when /notice/:id is used See merge request pleroma/pleroma!3300
2021-02-04Redirect non-local activities when /notice/:id is usedHaelwenn (lanodan) Monnier
Related-to: https://git.pleroma.social/pleroma/pleroma/-/issues/2496
2021-02-04Merge branch 'chore/external-emoji-example' into 'develop'Haelwenn
Stop external emoji example from leaking See merge request pleroma/pleroma!3302
2021-02-03Load an emoji.txt specific to the test envMark Felder
2021-02-03Document admin actors not getting report notificationsMark Felder
2021-02-03Validate admin making report doesn't get their own report notification, but ↵Mark Felder
other admins do
2021-02-03Exclude reporter from receiving notifications from their own reports.Mark Felder
Currently only works if the reporting actor is an admin, but if we include moderators with those who receive notification reports it will work for them.
2021-02-03Merge branch 'fix/openapi-relationship-nullable' into 'develop'rinpatch
Account schema: specify that pleroma.relationship is nullable See merge request pleroma/pleroma!3299
2021-02-03Account schema: specify that pleroma.relationship is nullablerinpatch
2021-02-03Merge branch 'fix/deploy-api-docs-2-electric-boogalo' into 'develop'rinpatch
CI: Forgot $ in spec-deploy See merge request pleroma/pleroma!3298
2021-02-03CI: Forgot $ in spec-deployrinpatch
2021-02-03Merge branch 'fix/2412-filters' into 'develop'feld
Support for expires_in/expires_at in filters Closes #2412 See merge request pleroma/pleroma!3279
2021-02-03Merge branch 'develop' into 'fix/2412-filters'feld
# Conflicts: # CHANGELOG.md
2021-02-03Merge branch 'fix/2449-scheduled-poll-bug' into 'develop'feld
Fix for scheduled post with poll Closes #2449 See merge request pleroma/pleroma!3294
2021-02-03Merge branch 'feature/2438-users-posts-total-count' into 'develop'feld
Feature/2438 users/instances posts total count Closes #2438 See merge request pleroma/pleroma!3270
2021-02-03Merge branch 'fix/deploy-api-docs' into 'develop'rinpatch
CI: Add job ref when calling api docs builder See merge request pleroma/pleroma!3297
2021-02-03CI: Add job ref when calling api docs builderrinpatch
Just grabbing the latest artifact for the branch does not work because gitlab will only change the latest artifact when the whole pipeline finishes
2021-02-03Merge branch 'feat/openapi-spec-export' into 'develop'rinpatch
Improve OpenAPI spec and deploy it to api.pleroma.social See merge request pleroma/pleroma!3296
2021-02-03Improve OpenAPI spec and deploy it to api.pleroma.socialrinpatch
Too many changes in OpenAPI spec to describe each one, but basically it is tag fixes, bringing consitency to operation summaries and fixing some incorrect information.
2021-02-03Add test for Answer presence into an authenticated /outboxHaelwenn (lanodan) Monnier
2021-02-03Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
feature/object-hashtags-rework # Conflicts: # CHANGELOG.md # lib/pleroma/web/activity_pub/activity_pub.ex
2021-02-02Merge branch 'a1batross-develop-patch-62810' into 'develop'feld
mix: instance: ensure all needed folders are created before generating config See merge request pleroma/pleroma!3284
2021-02-02Merge branch 'email-stub-in-verify-credentials' into 'develop'feld
Email-like field in /api/v1/accounts/verify_credentials (for PeerTube OAuth plugin and alike) See merge request pleroma/pleroma!3286
2021-02-02Merge branch 'develop' into a1batross-develop-patch-62810Mark Felder
2021-02-02Merge branch 'develop' into a1batross-develop-patch-62810Mark Felder
2021-02-02Mix pleroma.instance creates parent directories nowMark Felder
2021-02-02Merge branch 'fix/majic-nits' into 'develop'feld
Majic: don't fix extensions See merge request pleroma/pleroma!3287
2021-02-02Document OAuth 2.0 provider fqn field additionMark Felder
2021-02-02Merge branch 'fix/2411-mutes-api' into 'develop'feld
Support for with_relationships parameter Closes #2411 See merge request pleroma/pleroma!3290
2021-02-02Document we are disabling the extension fixup in MajicMark Felder
2021-02-02Merge branch 'develop' into fix/majic-nitsMark Felder
2021-02-02Merge branch 'develop' into 'fix/2411-mutes-api'feld
# Conflicts: # CHANGELOG.md # docs/development/API/differences_in_mastoapi_responses.md
2021-02-02Merge branch 'fix/2473-purge-expired-activities-duplicates' into 'develop'feld
fix and delete purge activities duplicates Closes #2473 See merge request pleroma/pleroma!3285
2021-02-02Merge branch 'feature/2164-unify-api-arguments' into 'develop'feld
Unifying timelines api arguments Closes #2164 See merge request pleroma/pleroma!3281
2021-02-02Improve changelog descriptionMark Felder
2021-02-02Merge branch 'develop' into 'feature/2164-unify-api-arguments'feld
# Conflicts: # CHANGELOG.md
2021-02-02Merge branch 'fix/attachment-cleanup' into 'develop'feld
Only run attachment cleanup if enabled See merge request pleroma/pleroma!3288
2021-02-02Merge branch 'active-user-count' into 'develop'feld
Monthly Active Users Closes #2332 See merge request pleroma/pleroma!3283
2021-02-01fix for test warningsAlexander Strizhakov
2021-02-01fix for scheduled post with pollAlexander Strizhakov
2021-02-01only_remote -> remote renamingAlexander Strizhakov
2021-02-01`/api/v1/accounts/:id/statuses` docs updateAlexander Strizhakov
2021-02-01more tests and update for docs and changelogAlexander Strizhakov
2021-02-01list timeline filtration by paramsAlexander Strizhakov
2021-02-01only_media & only_remote docs and changelogAlexander Strizhakov