summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-06-23moving to mrf namespace migration fixAlexander Strizhakov
2020-06-23Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'Haelwenn
Moving mrf settings from instance to separate mrf group Closes #1631 See merge request pleroma/pleroma!2320
2020-06-23Merge branch 'issue/1798' into 'develop'lain
[#1798] fixed migration the settings to DB See merge request pleroma/pleroma!2655
2020-06-23Merge branch 'fix_1586_provide_index_md' into 'develop'lain
Fix 1586 provide index md See merge request pleroma/pleroma!2669
2020-06-23fix testsMaksim Pechnikov
2020-06-23added testsMaksim Pechnikov
2020-06-23Merge branch '@doc/apc2s-upload-media' into 'develop'Haelwenn
ActivityPubController: Update upload_media @doc See merge request pleroma/pleroma!2673
2020-06-23ActivityPubController: Update upload_media @docHaelwenn (lanodan) Monnier
Small cherry-pick from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/1810
2020-06-23Merge branch 'fix/missing-default-instance_thumbnail_config' into 'develop'Haelwenn
Add missing default config value for :instance, instance_thumbnail See merge request pleroma/pleroma!2672
2020-06-22Do not need a function to provide fallback value with default defined in ↵Mark Felder
config.exs
2020-06-22Add missing default config value for :instance, instance_thumbnailMark Felder
Follows up on b7fc61e17b
2020-06-22Merge branch 'warning/mastofe-settings-blob' into 'develop'Haelwenn
Add warning against parsing/reusing MastoFE settings blob See merge request pleroma/pleroma!2671
2020-06-22Add warning against parsing/reusing MastoFE settings blobHaelwenn (lanodan) Monnier
2020-06-22Merge branch 'add-muted-to-notifications' into 'develop'lain
Add `pleroma.is_muted` property to notifications Closes #1812 See merge request pleroma/pleroma!2670
2020-06-22Update NotificationOperation specEgor Kislitsyn
2020-06-22Add `is_muted` to notificationsEgor Kislitsyn
2020-06-22added verify RUM settings before start appMaksim Pechnikov
2020-06-22Merge branch 'feature/1739-account-endpoints' into 'develop'lain
account visibility in masto api Closes #1739 See merge request pleroma/pleroma!2488
2020-06-22Merge branch 'docs_use_include_for_install_further_reading' into 'develop'lain
Add include for the "Further reading" section See merge request pleroma/pleroma!2667
2020-06-22Merge branch 'fix/1825-admin-api-error-codes' into 'develop'lain
Proper error codes for error in adminFE Closes #1825 See merge request pleroma/pleroma!2665
2020-06-22Merge branch 'weblate-pleroma-pleroma' into 'develop'lain
Translations update from Weblate See merge request pleroma/pleroma!2661
2020-06-22Removed a space that was too muchIlja
2020-06-22I forgot to git add some files, oops (should be squashed with MR)Ilja
2020-06-22Fix 1586 Docs: provide a index.mdIlja
* I renamed the introduction.md to index.md * I moved over the FE parts to an index file in the FE repo (will do an MR in the FE repo to actually add it) * While I was at it, I also fixed some broken links
2020-06-22Translated using Weblate (Italian)Ben Is
Currently translated at 0.9% (1 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/it/
2020-06-22Added translation using Weblate (Italian)Ben Is
2020-06-22Merge branch '1865-media-only' into 'develop'rinpatch
Resolve "/api/v1/accounts/:id/statuses?only_media=true returns media that is not owned" Closes #1865 See merge request pleroma/pleroma!2650
2020-06-22Merge branch '1883-mrf-chat' into 'develop'rinpatch
HellthreadPolicy: Restrict to Notes and Articles. Closes #1883 See merge request pleroma/pleroma!2666
2020-06-22Add include for the "Further reading" sectionIlja
* I added an include and use this include for the installation guides that already had this section * I added the "Further reading" section as well as te "Questions" section to the English guides that didn't have it yet * I added a first point "How Federation Works/Why is my Federated Timeline empty?" to link to lains blogpost about this because we still get this question a lot in the #pleroma support channel * I reordered the list a bit
2020-06-22Merge branch 'feature/1854-emoji-pagination' into 'develop'lain
Emoji and packs pagination Closes #1854 See merge request pleroma/pleroma!2658
2020-06-22HellthreadPolicy: Restrict to Notes and Articles.lain
2020-06-20Merge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop'lain
mix.exs: version git-less (part 2, MacOS-compat) See merge request pleroma/pleroma!2420
2020-06-20Apply suggestion to ↵Alexander Strizhakov
lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
2020-06-20proper error codes for error in adminFEAlexander Strizhakov
2020-06-20Merge branch 'feature/support-bot-field-in-update-credentials' into 'develop'lain
Support 'bot' field in account update_credentials Closes #1600 and #1467 See merge request pleroma/pleroma!2662
2020-06-20Merge branch 'docs/attachment_links' into 'develop'lain
cheatsheet.md: no_attachment_links → attachment_links See merge request pleroma/pleroma!2664
2020-06-20Merge branch 'cleanup/object-conversation' into 'develop'lain
Stop filling conversation field on incoming objects (legacy, unused) See merge request pleroma/pleroma!2663
2020-06-20Apply suggestion to ↵lain
lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
2020-06-20cheatsheet.md: no_attachment_links → attachment_linksHaelwenn (lanodan) Monnier
2020-06-20Apply suggestion to lib/mix/tasks/pleroma/config.exlain
2020-06-20Merge branch 'develop' into '1865-media-only'lain
# Conflicts: # CHANGELOG.md
2020-06-20fix for packs paginationAlexander Strizhakov
2020-06-20Stop filling conversation field on incoming objects (legacy, unused)Haelwenn (lanodan) Monnier
conversation field is still set for outgoing federation for compatibility.
2020-06-19Merge branch 'issue/1855' into 'develop'feld
#1855 MediaProxy cache invalidation via Admin API See merge request pleroma/pleroma!2648
2020-06-19Only accounts with Service actor_type are considered as botsSergey Suprunenko
2020-06-19Add support for bot field in update_credentialsSergey Suprunenko
2020-06-19Merge branch 'add-troubleshooting-info' into 'develop'lain
README: Add some troubleshooting info for compilation issues. See merge request pleroma/pleroma!2660
2020-06-19README: Add some troubleshooting info for compilation issues.lain
2020-06-19Merge branch '1873-pagination-fixes' into 'develop'lain
[#1873] :offset pagination param support, hashtags pagination Closes #1873 See merge request pleroma/pleroma!2659
2020-06-19Merge branch 'dry-up-follower-update' into 'develop'lain
User: update_follower_count refactor. See merge request pleroma/pleroma!2649
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-31 11:48:45 +0000