aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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
2019-10-19rework to use properties instead of compound typing, per SocialCGAriadne Conill
2019-10-19fix testMaksim Pechnikov
2019-10-19added test fo Pleroma.Web.MastodonAPI.StatusControllerMaksim Pechnikov
2019-10-19test: activitypub: use User.invisible?/1 for testing invisibilityAriadne Conill
2019-10-19implement invisible support for remote usersAriadne Conill
2019-10-19user: implement User.invisible?/1Ariadne Conill
2019-10-19relay: set invisible to trueAriadne Conill
2019-10-19user info: add invisible fieldAriadne Conill
2019-10-19Merge branch 'chore/fixup-testsuite-import' into 'develop'kaniini
tests: ostatus controller tests: fix sporadic compilation failure See merge request pleroma/pleroma!1867
2019-10-19tests: ostatus controller tests: fix sporadic compilation failureAriadne Conill
2019-10-19Merge branch 'feature/mastofe-pwa' into 'develop'Haelwenn
MastoFE: Add PWA manifest. See merge request pleroma/pleroma!1834
2019-10-19Merge branch 'mark-all-conversations-as-read' into 'develop'Haelwenn
Pleroma API: `POST /api/v1/pleroma/conversations/read` See merge request pleroma/pleroma!1830
2019-10-19Merge branch 'develop-version-bump' into 'develop'rinpatch
mix.exs: Bump version for develop builds See merge request pleroma/pleroma!1866
2019-10-19mix.exs: Bump version for develop buildsrinpatch
As per discussion on irc, we already used GNU-style versioning system for release candidates, so it makes sense to use it for develop builds as well.
2019-10-19Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's ↵eugenijm
conversations as read
2019-10-19Add documentation for PWA manifest configuration.KokaKiwi
2019-10-19MastoFE: Add PWA manifest.KokaKiwi
2019-10-19Merge branch 'mix-emoji-task-pack-json' into 'develop'rinpatch
For pleroma.emoji downloaded packs, generate pack.json instead See merge request pleroma/pleroma!1748
2019-10-18Merge branch 'develop' into feature/push-subject-for-dmMark Felder
2019-10-18Direct messages should provide a distinct push notification subjectMark Felder
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 00:45:55 +0000