aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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
2021-02-01added only_media flag to home timelineAlexander Strizhakov
2021-02-01expanding filtration for home timelineAlexander Strizhakov
added local & remote statuses filtration for home timeline
2021-02-01Merge branch 'update-frontend-2021-02-01' into 'develop'rinpatch
Update frontend Closes #2493 See merge request pleroma/pleroma!3293
2021-02-01Update frontendLain Soykaf
2021-01-30Merge branch 'emoji-cache' into 'develop'feld
Emoji cache Closes #2468 See merge request pleroma/pleroma!3291
2021-01-29Merge branch 'fix/configdb-missing-s3-region' into 'develop'feld
ConfigDB descriptions: Add missing :ex_aws, :s3, :region setting See merge request pleroma/pleroma!3292
2021-01-29Add missing :ex_aws, :s3, :region settingMark Felder
2021-01-29[#3286] Documentation on configuring Pleroma as OAuth 2.0 provider.Ivan Tashkinov
2021-01-29like thisAlexander Strizhakov
2021-01-29support for with_relationships parameterAlexander Strizhakov
in /api/v1/mutes and /api/v1/accounts/:id endpoints
2021-01-28Improve error message for ConfigDBMark Felder
2021-01-28Make attachment cleanup jobs a noop if the setting is disabled.Mark Felder
2021-01-28Switch to a build of Majic that does not try to fix extensions by defaultMark Felder
2021-01-28Make sure active_user_count/1 counts only local usersEgor Kislitsyn
2021-01-28Email-like field in /api/v1/accounts/verify_credentials response (for OAuth ↵Ivan Tashkinov
plugins like Peertube). Addresses https://git.pleroma.social/pleroma/pleroma-support/-/issues/56.