summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-24fix link on docs-develop.pleroma.socialMaksim Pechnikov
2019-10-24Merge branch 'develop' into issue/1276Maksim Pechnikov
2019-10-23add testsMaksim Pechnikov
2019-10-23Store status data inside Flag activityMaxim Filippov
2019-10-23fix migrateMaksim Pechnikov
2019-10-23Merge branch '1304-user-info-deprecation' into 'develop'feld
[#1304] User.Info deprecation Closes #1304 See merge request pleroma/pleroma!1851
2019-10-23[#1304] Extra bullet-proofing.Ivan Tashkinov
2019-10-23[#1304] Adjusted User.Info references from Notification.Ivan Tashkinov
2019-10-23Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1304-user-info-deprecation # Conflicts: # lib/pleroma/notification.ex
2019-10-23[#1304] Fixed null::jsonb handling in User.Info migration.Ivan Tashkinov
2019-10-23SideEffectsTest: Fix test.lain
2019-10-23Credo fixes.lain
2019-10-23Add Pipeline module, test for federation.lain
2019-10-23added update unread_count for notificationsMaksim Pechnikov
2019-10-23Merge branch 'bugfix/announce-with-bare-to-cc' into 'develop'kaniini
activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors Closes #1326 See merge request pleroma/pleroma!1874
2019-10-22activitypub: visibility: refactor is_public?() to use JSON-LD safe accessorsAriadne Conill
2019-10-23Merge branch 'chore/add-single-value-deserialization-tests' into 'develop'kaniini
tests: transmogrifier: add explicit regression tests for JSON-LD strings as single-element array fuckery See merge request pleroma/pleroma!1873
2019-10-22tests: transmogrifier: add explicit regression tests for JSON-LD string to ↵Ariadne Conill
single-element array deserialization There appears to be confusion on whether or not Pleroma can handle this particular sin of JSON-LD. It can, and we will add regression tests to prove that it can handle this particular sin. Which, by the way, this is actually not a "feature" of JSON-LD, but whatever.
2019-10-22Relocate to configuration subdirMark Felder
2019-10-22Remove proxy_cache_lock suggestionMark Felder
2019-10-22FormattingMark Felder
2019-10-22Leverage nginx proxy cache to store items with a 1 year TTL with no size limit.Mark Felder
It does not purge items when they expire, but will only update them if the origin's copy has changed for some reason. If origin is offline/unavailable or gone forever it will still serve the cached copies.
2019-10-22Initial doc about storing remote mediaMark Felder
2019-10-22Marker: added unread_count fieldMaksim Pechnikov
2019-10-21Merge branch 'feature/push-subject-for-dm' into 'develop'kaniini
Direct messages should provide a distinct push notification subject See merge request pleroma/pleroma!1864
2019-10-21SpellingMark Felder
2019-10-21Add tests for the subject of push notificationsMark Felder
2019-10-21Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop'rinpatch
Do not include notifications from blocked users when with_muted is set See merge request pleroma/pleroma!1869
2019-10-21Do not include notifications from blocked users when with_muted is setrinpatch
This is not what with_muted is for per documentation and it was agreed on irc that this behavior doesn't make sense.
2019-10-21Merge branch 'feature/masto_api_markers' into 'develop'kaniini
[#1275] Markers /api/v1/markers See merge request pleroma/pleroma!1852
2019-10-21[#1304] Merged `develop`, handled User.Info.invisible.Ivan Tashkinov
2019-10-21Fix benchmarksEgor Kislitsyn
2019-10-21update changelogMaksim Pechnikov
2019-10-21Merge branch 'develop' into feature/masto_api_markersMaksim Pechnikov
2019-10-21Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1304-user-info-deprecation # Conflicts: # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/activity_pub/transmogrifier.ex
2019-10-21Fix typosEgor Kislitsyn
2019-10-21Merge branch 'feature/activitypub-semantics' into 'develop'kaniini
activitypub semantics See merge request pleroma/pleroma!1798
2019-10-21Revert "Skip deactivated users in followers import"Egor Kislitsyn
This reverts commit 8ad015ef64e0d2a4cd9f2979ff08d28be3a635e5.
2019-10-21Fix RelayEgor Kislitsyn
2019-10-21[#1304] Typo fix.Ivan Tashkinov
2019-10-21Merge branch 'develop' into refactor/following-relationshipsEgor Kislitsyn
2019-10-20[#1304]. Post-merge fixes. Merge branch 'develop' of ↵Ivan Tashkinov
git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs
2019-10-20Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1304-user-info-deprecation # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs
2019-10-20Merge branch 'chore/add-missing-websub-drop-migration' into 'develop'kaniini
add missing migration to drop websub table See merge request pleroma/pleroma!1868
2019-10-20[#1304] Analysis issue fix.Ivan Tashkinov
2019-10-20[#1304] Moved remaining fields from User.Info to User.Ivan Tashkinov
Misc. fixes / improvements.
2019-10-20add missing migration to drop websub tableAriadne Conill
2019-10-19change Maksim's test descriptionAriadne Conill
2019-10-19tests: add test to ensure invisible actors are rendered with the invisible ↵Ariadne Conill
hint set to true
2019-10-19tests: add test verifying the relay user is invisibleAriadne Conill
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-11 16:00:30 +0000