aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-06-26Simplify notification filtering settings furtherMark Felder
2020-06-26Merge branch 'develop' into refactor/notification_settingsMark Felder
2020-06-26Merge branch 'fix-chats' into 'develop'lain
Nodeinfo: Add chat information back in. See merge request pleroma/pleroma!2691
2020-06-26Nodeinfo: Add chat information back in.lain
2020-06-26Merge branch 'hotfix/preload-tests-nodeinfo' into 'develop'Haelwenn
nodeinfo: Fix MRF transparency See merge request pleroma/pleroma!2689
2020-06-26nodeinfo: Fix MRF transparencyHaelwenn (lanodan) Monnier
2020-06-25Merge branch 'preload-data' into 'develop'feld
Preload data into index.html Closes #1660 See merge request pleroma/pleroma!2381
2020-06-25Merge branch 'mastoapi-omitted' into 'develop'feld
MastoAPI differences: Document not implemented features See merge request pleroma/pleroma!2687
2020-06-25Merge branch 'update/admin-fe-20200625' into 'develop'feld
Update AdminFE build See merge request pleroma/pleroma!2688
2020-06-25Update AdminFE buildMark Felder
2020-06-25Merge branch 'develop' into refactor/notification_settingsMark Felder
2020-06-25MastoAPI differences: Document not implemented featuresAlex Gleason
2020-06-25Merge branch 'chore/remove-reference-to-distsn' into 'develop'lain
Remove reference to defunct distsn.org See merge request pleroma/pleroma!2675
2020-06-25Apply suggestion to config/description.exslain
2020-06-25Merge branch 'issue/1872-ex_aws' into 'develop'lain
[#1872] use Pleroma.HTTP for ExAws.S3 See merge request pleroma/pleroma!2683
2020-06-25Merge branch 'fix/following-request-from-deactivated' into 'develop'lain
Filter outstanding follower requests from deactivated accounts Closes #1771 See merge request pleroma/pleroma!2682
2020-06-25added wrapper Pleroma.HTTP for ExAws.S3Maksim Pechnikov
2020-06-24Filter outstanding follower requests from deactivated accountsMark Felder
2020-06-24Merge branch 'fix-emoji-pagination' into 'develop'lain
Fix for emoji pagination in pack show See merge request pleroma/pleroma!2681
2020-06-24fix for emoji pagination in pack showAlexander Strizhakov
2020-06-24Merge branch 'feature/admin-api-status-count-per-instance' into 'develop'lain
admin api status count per instance See merge request pleroma/pleroma!2500
2020-06-24Merge branch 'issue/1872-updated-tzdata' into 'develop'lain
[#1872] use Pleroma.HTTP for Tzdata See merge request pleroma/pleroma!2678
2020-06-24Apply suggestion to test/http/tzdata_test.exslain
2020-06-24added wrapper Pleroma.HTTP for Tzdata.HTTPClientMaksim Pechnikov
2020-06-23Merge branch 'moving-mrf-namespace-migration-fix' into 'develop'feld
Moving to mrf namespace migration fix See merge request pleroma/pleroma!2676
2020-06-23Merge branch 'update-validator' into 'develop'lain
Update validator See merge request pleroma/pleroma!2668
2020-06-23Merge developRoman Chvanikov
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-23Remove reference to defunct distsn.orgMark Felder
2020-06-23Merge branch 'issue/1798' into 'develop'lain
[#1798] fixed migration the settings to DB See merge request pleroma/pleroma!2655
2020-06-23ObjectValidator: Clarify type of object.lain
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-23ActivityPubControllerTest: Capture error loglain
2020-06-23ActivityPubControllerTest: Testing changes.lain
2020-06-23An act of desperation.lain
2020-06-23Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
update-validator
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
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-25 02:42:15 +0000