8cc809e44e
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/notification.ex
5 years ago
3f6a596922
activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors
5 years ago
277aea45b9
tests: transmogrifier: add explicit regression tests for JSON-LD string to 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.
5 years ago
6281e4795a
Merge branch 'feature/push-subject-for-dm' into 'develop'
...
Direct messages should provide a distinct push notification subject
See merge request pleroma/pleroma!1864
5 years ago
0c628fafc5
Spelling
5 years ago
2cbb3f2364
Add tests for the subject of push notifications
5 years ago
7c7f90bc4f
[ #1304 ] Merged `develop`, handled User.Info.invisible.
5 years ago
243719a965
Merge branch 'develop' into feature/masto_api_markers
5 years ago
a11a7176d5
Merge remote-tracking branch 'remotes/upstream/develop' into 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
5 years ago
ee04fbc35a
[ #1304 ]. Post-merge fixes. Merge branch 'develop' of 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
5 years ago
c6fdfbc4f1
Merge remote-tracking branch 'remotes/upstream/develop' into 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
5 years ago
05c58eaece
change Maksim's test description
5 years ago
ba92522c69
tests: add test to ensure invisible actors are rendered with the invisible hint set to true
5 years ago
52d56ed705
tests: add test verifying the relay user is invisible
5 years ago
189a288925
fix test
5 years ago
9694d51437
added test fo Pleroma.Web.MastodonAPI.StatusController
5 years ago
80d3912a56
test: activitypub: use User.invisible?/1 for testing invisibility
5 years ago
ef659331b0
implement invisible support for remote users
5 years ago
cd90735a4b
tests: ostatus controller tests: fix sporadic compilation failure
5 years ago
52ed2f8f2d
Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read
5 years ago
019147f115
Merge branch 'develop' into feature/relay-list
5 years ago
c2ae6310dc
tests: mastodon api: fix broken test that used OStatus
5 years ago
a8eb1f0975
tests: mastodon search: search for an account that is visible via activitypub, not ostatus
5 years ago
dbfdb1f6e3
add some missing tesla fixtures
5 years ago
700c654208
tests: fix relay tests
5 years ago
48059c03c9
fix up some tests
5 years ago
d379b48769
kill almost all of the OStatus module
5 years ago
835ad52378
remove Salmon module
5 years ago
4f82e42e4e
websub: remove entirely
5 years ago
c6de0cbb4a
config: disable Websub and Salmon publisher modules
5 years ago
2473702be2
Merge branch 'develop' into feature/relay-list
5 years ago
359dd1890e
Mastodon API: Mark the conversation as read for the author when they send a new direct message
5 years ago
66b5d0ff55
add Markers /api/v1/markers
5 years ago
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
da0e4879bc
DELETE /api/pleroma/admin/users now accepts nicknames array
5 years ago
a97b642289
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
5 years ago
751513b6df
This line either causes a warning, or a failed test
5 years ago
cc6875b582
Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays
5 years ago
c0aca32dd0
Merge branch 'develop' into feature/multiple-users-activation-permissions
5 years ago
aaa4252f41
Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
5 years ago
cb8492962e
SearchController: Fix test.
...
Turns out you can't actually find the user with this.
5 years ago
37812740c4
Transmogrifier: Correctly save incoming ids for Accept/Reject.
5 years ago
9b963064eb
Transmogrifier: Actually store who deleted a note.
5 years ago
f5104f36bb
Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
5 years ago
29647dfd09
Transmogrifier: Save correct ids for incoming deletes.
5 years ago
9fd5176c35
Merge branch 'unicode-search' into 'develop'
...
Search: Add tests for unicode searches.
See merge request pleroma/pleroma!1824
5 years ago
ad42837244
Ability to toggle activation status and permission group for a group of users
5 years ago
c1bae01376
Search: Add tests for unicode searches.
5 years ago
580a67f5ca
Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status (`GET /api/v1/statuses/:id`)
5 years ago
4b3f77a99f
Extract RSS Feed functionality from OStatus
5 years ago
Ivan Tashkinov