summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-02Merge branch 'develop' into fix/majic-nitsMark Felder
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-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-29like thisAlexander Strizhakov
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-28changelog entryAlexander Strizhakov
2021-01-28fix and delete purge activities duplicatesAlexander Strizhakov
2021-01-27cache headers for emoji and imagesAlexander Strizhakov
2021-01-27Update CHANGELOGEgor Kislitsyn
2021-01-27Add testsEgor Kislitsyn
2021-01-27Add active user countEgor Kislitsyn
2021-01-27Merge branch 'chore/tests-use-clear_config' into 'develop'lain
Convert tests to all use clear_config instead of Pleroma.Config.put See merge request pleroma/pleroma!3282
2021-01-26Merge branch 'service-worker-allowed-header' into 'develop'feld
Ability to set custom HTTP headers per each frontend See merge request pleroma/pleroma!3247
2021-01-26Convert tests to all use clear_config instead of Pleroma.Config.putMark Felder
2021-01-26Merge branch '2435-list-multiple-users' into 'develop'Haelwenn
Resolve "Add/Remove several accounts from List don't work" Closes #2435 See merge request pleroma/pleroma!3260
2021-01-26Merge branch 'develop' into '2435-list-multiple-users'lain
# Conflicts: # CHANGELOG.md
2021-01-26Merge branch 'fix/missing-own_votes' into 'develop'Haelwenn
Include own_votes in the poll data See merge request pleroma/pleroma!3274
2021-01-26Merge branch 'docs/apache-config' into 'develop'feld
Update Apache configuration See merge request pleroma/pleroma!3271
2021-01-25CredoMark Felder
2021-01-25Clarify the state of mediaproxy cache invalidation for ApacheMark Felder
2021-01-25Note the requirement for the url_format parameterMark Felder
2021-01-25Add sudo rule, remove quoting that breaks the for loopMark Felder
2021-01-25Merge branch 'develop' into docs/apache-configMark Felder
2021-01-25Merge branch 'refactor/deactivated_user_field' into 'develop'feld
Change user.deactivated field to user.is_active See merge request pleroma/pleroma!3073
2021-01-25Ensure consistent behavior between pleroma.user activate/deactivate mix tasksMark Felder
2021-01-25little refactor and testsAlexander Strizhakov
for voted & own_votes fields in polls
2021-01-25Document pleroma.user activate mix taskMark Felder
2021-01-25Provide pleroma.user mix task for both activate and deactivateMark Felder
2021-01-25Document removal of toggle_activatedMark Felder
2021-01-25Update PleromaFE: pleroma-fe@eb2975b64d849af6bdc327dabac34b8e6d952eaeMark Felder
2021-01-25Update AdminFE: admin-fe@8a390584676b27b611d3363eca2a1194d94ed71fMark Felder
2021-01-25Merge branch 'develop' into refactor/deactivated_user_fieldMark Felder
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-16 16:22:45 +0000