rinpatch
4b10804f21
OStatus controller: don't serve json at /notice/, redirect instead
5 years ago
rinpatch
02f7383891
ActivityPub controller: do not render remote users
5 years ago
Maxim Filippov
82f4e4760e
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
Maxim Filippov
fd24467b92
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
Maxim Filippov
2b341627da
Admin API: Render whole status in grouped reports
5 years ago
lain
bd62946020
Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
...
AdminAPI: Confirm user account, resend confirmation email
See merge request pleroma/pleroma!1994
5 years ago
Ivan Tashkinov
cad9b325e5
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user/search.ex
# test/user_test.exs
5 years ago
lain
8feb5dcb42
Merge branch 'issue/1348' into 'develop'
...
[#1348 ] excluded invisible actors from gets /api/v1/accounts/:id
See merge request pleroma/pleroma!1937
5 years ago
Ivan Tashkinov
4f88b1b435
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Ivan Tashkinov
de892d2fe1
[ #1335 ] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
5 years ago
Egor Kislitsyn
63711258ce
Fix sporadically failing test
5 years ago
Ivan Tashkinov
ba5cc30165
[ #1335 ] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
5 years ago
Maksim Pechnikov
708fd234bd
fix order favorites activites
5 years ago
Maxim Filippov
b88dbc17c8
Fix tests
5 years ago
Maxim Filippov
46eb160135
AdminAPI: Confirm user account, resend confirmation email
5 years ago
Maksim Pechnikov
7d727dbfec
added test
5 years ago
Ivan Tashkinov
3aaf3aa2c2
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
kaniini
81cba405af
Merge branch 'nodeinfo-fields-limit' into 'develop'
...
Add fieldsLimit to metadata of nodeinfo
See merge request pleroma/pleroma!1983
5 years ago
Ivan Tashkinov
01d9c093c3
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Ivan Tashkinov
c31ddce51e
[ #1335 ] Reorganized `users.mutes` as relation to UserMute entity.
5 years ago
kPherox
c9a06b14ab
Add test
5 years ago
Ariadne Conill
7c59bc9ef9
fix credo
5 years ago
Ariadne Conill
5705cf0e3e
MRF: add ObjectAgePolicy which deals with old posts being imported
5 years ago
Maxim Filippov
114930b5fd
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
Maxim Filippov
30af5da330
Admin API: list all statuses from a given instance
5 years ago
feld
1afeaf82fa
Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
...
Admin API: Grouped reports, update multiple reports in one query
Closes admin-fe#43
See merge request pleroma/pleroma!1815
5 years ago
Egor Kislitsyn
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
5 years ago
rinpatch
6085c71bd1
Merge branch 'reactions' into 'develop'
...
Emoji Reactions
See merge request pleroma/pleroma!1662
5 years ago
Phil Hagelberg
3c60adbc1f
Support redirecting by activity UUID in static FE as well.
5 years ago
Phil Hagelberg
0867cb083e
Support redirecting by object ID in static FE.
...
This matches the behavior of pleroma-fe better.
Fixes #1412 .
5 years ago
Phil Hagelberg
62f3a93049
For remote notices, redirect to the original instead of 404.
...
We shouldn't treat these like local statuses, but I don't think a 404
is the right choice either here, because within pleroma-fe, these are
valid URLs. So with remote notices you have the awkward situation
where clicking a link will behave differently depending on whether you
open it in a new tab or not; the new tab will 404 if it hits static-fe.
This new redirecting behavior should improve that situation.
5 years ago
Egor Kislitsyn
27cd1374e3
Add a notification for Move activities
5 years ago
Egor Kislitsyn
e6d7e27bd6
Add `allow_following_move` setting to User
5 years ago
eugenijm
f86a7d5d8b
Fix exclude_visibilities filter for followers-only Like notifications
5 years ago
feld
e27d78e768
Merge branch 'nodeinfo-federation-enabled' into 'develop'
...
report federating status in nodeinfo
See merge request pleroma/pleroma!1971
5 years ago
kaniini
2cc043591c
Merge branch 'feature/static-fe' into 'develop'
...
Static frontend
See merge request pleroma/pleroma!1917
5 years ago
href
b39b49cc14
report federating status in nodeinfo
5 years ago
lain
1ca7b877a1
Merge branch 'iss-1376' into 'develop'
...
Check client and token in GET /oauth/authorize
See merge request pleroma/pleroma!1940
5 years ago
Maxim Filippov
46787b9fe1
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
Alexander
6a4201e0b4
fix for migrate task
5 years ago
Ivan Tashkinov
3db988250b
[ #1335 ] User: refactored :blocks field into :blocked_users relation.
...
Introduced UserBlock.
5 years ago
lain
a88e834dba
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Maksim Pechnikov
9d0b989521
add subject to atom feed
5 years ago
Phil Hagelberg
6ef8049664
Add changelog entry, cheatsheet docs, and alphabetize.
5 years ago
Phil Hagelberg
ef7c3bdc7a
Add some further test cases.
...
Including like ... private visibility, cos that's super important.
5 years ago
Phil Hagelberg
2bf592f5dc
Add tests for static_fe controller.
5 years ago
lain
b22ee9d966
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
Maxim Filippov
b14bf9044f
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
Maxim Filippov
7258db023e
Support old flag format
5 years ago
eugenijm
7888803ffe
Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`
5 years ago
Maxim Filippov
f171095960
Grouped reports with status data baked in
5 years ago
AkiraFukushima
e1fc6cb78f
Check client and token in GET /oauth/authorize
5 years ago
Maxim Filippov
2cbfa256fd
Merge branch 'develop' into feature/multiple-users-force-password-reset
5 years ago
Maxim Filippov
43ea16870f
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
Maksim Pechnikov
4b7c11e3f9
excluded invisible actors from gets /api/v1/accounts/:id
5 years ago
eugenijm
ed29be24cb
Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload.
5 years ago
lain
a304a2a845
Merge branch 'transmogrifier-test-errors' into 'develop'
...
capture test log where errors are expected
See merge request pleroma/pleroma!1915
5 years ago
Steven Fuchs
5271bbcf11
add missing tesla mocks
5 years ago
lain
556da92902
Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'
...
Store status data inside flag activity
See merge request pleroma/pleroma!1849
5 years ago
rinpatch
8dd7c099a7
Merge branch 'bugfix/streamer-follows' into 'develop'
...
streamer: use direct object for filter checks when there is no valid child object in an activity
Closes #1291
See merge request pleroma/pleroma!1931
5 years ago
kaniini
74135e1318
Merge branch 'feature/omit-relay-user' into 'develop'
...
AdminAPI: Omit relay user from users list
Closes #1349
See merge request pleroma/pleroma!1924
5 years ago
Ariadne Conill
4bf942583f
streamer: use direct object for filter checks when there is no valid child object in an activity
...
We call Object.normalize/1 to get the child object for situations like Announce.
However, the check is flawed and immediately fails if Object.normalize/1 fails.
Instead, we should use the activity itself in those cases to allow activities which
never have a child object to pass through the filter.
Closes #1291
5 years ago
Maxim Filippov
743b622b7b
Force password reset for multiple users
5 years ago
Maxim Filippov
6f9d3d30fa
AdminAPI: Omit relay user from users list
5 years ago
Mark Felder
fcea6a9d2c
Merge branch 'develop' into feature/fast_sanitize
5 years ago
Egor Kislitsyn
61fc739ab8
Handle "Move" activity
5 years ago
rinpatch
ae59b38203
Rip out the rest of htmlsanitizeex
5 years ago
kPherox
c2f2d7bcf6
Add test follow activity for locked account
5 years ago
rinpatch
08f6837065
Switch from HtmlSanitizeEx to FastSanitize
5 years ago
stwf
56e42602b0
capture where errors are expected
5 years ago
Egor Kislitsyn
4270861085
Merge branch 'develop' into feature/move-activity
5 years ago
lain
2480200759
Merge branch 'refactor/following-relationships' into 'develop'
...
Move following relationships to a separate table
Closes #1233
See merge request pleroma/pleroma!1814
5 years ago
Maxim Filippov
8282b6ac3d
Make sure incoming flags are updated with status data
5 years ago
Maxim Filippov
791bcfd90f
Merge branch 'develop' into feature/store-statuses-data-inside-flag
5 years ago
Maxim Filippov
8eff05d4c6
Strip status data from Flag (when federating or closing/resolving report)
5 years ago
Egor Kislitsyn
b777083f3f
Add `also_known_as` field to Pleroma.User
5 years ago
stwf
5329b361ec
fix test
5 years ago
Egor Kislitsyn
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
5 years ago
Maxim Filippov
b08b1d5d91
Store status data inside Flag activity
5 years ago
Ivan Tashkinov
8cc809e44e
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/notification.ex
5 years ago
Ariadne Conill
3f6a596922
activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors
5 years ago
Ariadne Conill
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
kaniini
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
Mark Felder
0c628fafc5
Spelling
5 years ago
Mark Felder
2cbb3f2364
Add tests for the subject of push notifications
5 years ago
Ivan Tashkinov
7c7f90bc4f
[ #1304 ] Merged `develop`, handled User.Info.invisible.
5 years ago
Maksim Pechnikov
243719a965
Merge branch 'develop' into feature/masto_api_markers
5 years ago
Ivan Tashkinov
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
Egor Kislitsyn
c6fba62666
Fix Relay
5 years ago
Egor Kislitsyn
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
5 years ago
Ivan Tashkinov
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
Ivan Tashkinov
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
Ariadne Conill
05c58eaece
change Maksim's test description
5 years ago
Ariadne Conill
ba92522c69
tests: add test to ensure invisible actors are rendered with the invisible hint set to true
5 years ago
Ariadne Conill
52d56ed705
tests: add test verifying the relay user is invisible
5 years ago
Maksim Pechnikov
189a288925
fix test
5 years ago
Maksim Pechnikov
9694d51437
added test fo Pleroma.Web.MastodonAPI.StatusController
5 years ago
Ariadne Conill
80d3912a56
test: activitypub: use User.invisible?/1 for testing invisibility
5 years ago
Ariadne Conill
ef659331b0
implement invisible support for remote users
5 years ago
Ariadne Conill
cd90735a4b
tests: ostatus controller tests: fix sporadic compilation failure
5 years ago
eugenijm
52ed2f8f2d
Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read
5 years ago
Maxim Filippov
019147f115
Merge branch 'develop' into feature/relay-list
5 years ago
Ariadne Conill
c2ae6310dc
tests: mastodon api: fix broken test that used OStatus
5 years ago
Ariadne Conill
a8eb1f0975
tests: mastodon search: search for an account that is visible via activitypub, not ostatus
5 years ago
Ariadne Conill
dbfdb1f6e3
add some missing tesla fixtures
5 years ago
Ariadne Conill
700c654208
tests: fix relay tests
5 years ago
Ariadne Conill
48059c03c9
fix up some tests
5 years ago
Ariadne Conill
d379b48769
kill almost all of the OStatus module
5 years ago
Ariadne Conill
835ad52378
remove Salmon module
5 years ago
Ariadne Conill
4f82e42e4e
websub: remove entirely
5 years ago
Ariadne Conill
c6de0cbb4a
config: disable Websub and Salmon publisher modules
5 years ago
Maxim Filippov
2473702be2
Merge branch 'develop' into feature/relay-list
5 years ago
eugenijm
359dd1890e
Mastodon API: Mark the conversation as read for the author when they send a new direct message
5 years ago
Maksim Pechnikov
66b5d0ff55
add Markers /api/v1/markers
5 years ago
Ivan Tashkinov
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
Maxim Filippov
da0e4879bc
DELETE /api/pleroma/admin/users now accepts nicknames array
5 years ago
eugenijm
a97b642289
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
5 years ago
Maxim Filippov
751513b6df
This line either causes a warning, or a failed test
5 years ago
Maxim Filippov
cc6875b582
Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays
5 years ago
Maxim Filippov
c0aca32dd0
Merge branch 'develop' into feature/multiple-users-activation-permissions
5 years ago
Maxim Filippov
aaa4252f41
Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
5 years ago
lain
cb8492962e
SearchController: Fix test.
...
Turns out you can't actually find the user with this.
5 years ago
lain
37812740c4
Transmogrifier: Correctly save incoming ids for Accept/Reject.
5 years ago
lain
9b963064eb
Transmogrifier: Actually store who deleted a note.
5 years ago
Maxim Filippov
f5104f36bb
Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
5 years ago
Egor Kislitsyn
059005ff82
Replace `user.following` with Pleroma.FollowingRelationship
5 years ago
lain
29647dfd09
Transmogrifier: Save correct ids for incoming deletes.
5 years ago
lain
d7f9679ff2
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Maxim Filippov
24eecc3cb4
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
kaniini
9fd5176c35
Merge branch 'unicode-search' into 'develop'
...
Search: Add tests for unicode searches.
See merge request pleroma/pleroma!1824
5 years ago
Maxim Filippov
ad42837244
Ability to toggle activation status and permission group for a group of users
5 years ago
lain
c1bae01376
Search: Add tests for unicode searches.
5 years ago
eugenijm
580a67f5ca
Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status (`GET /api/v1/statuses/:id`)
5 years ago
Maxim Filippov
35068baf65
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
Maxim Filippov
7aceaa517b
Admin API: Reports, grouped by status
5 years ago
lain
6c278cfe09
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Sergey Suprunenko
4b3f77a99f
Extract RSS Feed functionality from OStatus
5 years ago
lain
73b6512907
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
kaniini
93bdc55306
Merge branch 'mrf/simple_policy/check_actor' into 'develop'
...
mrf/simple_policy: check actor against accept/reject
See merge request pleroma/pleroma!1806
5 years ago
lain
91e90aa807
Merge branch 'misskey-compat' into 'reactions'
...
Transmogrifier: Handle misskey likes with reactions like EmojiReactions.
See merge request pleroma/pleroma!1783
5 years ago
Haelwenn (lanodan) Monnier
58aeabd020
mrf/simple_policy: check actor against accept/reject
5 years ago
Ivan Tashkinov
06b3bb54c5
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
5 years ago
lain
61097ba6ab
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Haelwenn
9e34919dcd
Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'
...
Fix custom fields of accounts update credentials
See merge request pleroma/pleroma!1597
5 years ago
kaniini
7a318d74e6
Merge branch 'split-masto-api/leftovers' into 'develop'
...
[#1278 ] Move a few more actions from MastodonAPIController
See merge request pleroma/pleroma!1761
5 years ago
kaniini
45b7f03f89
Merge branch 'accept-embedded-announce-object' into 'develop'
...
Import object from self-Announce whenever possible
See merge request pleroma/pleroma!1770
5 years ago
kaniini
17ff4b43cb
Merge branch 'unread-conversation-count' into 'develop'
...
Add `pleroma.unread_conversation_count` to the Account entity
See merge request pleroma/pleroma!1796
5 years ago
eugenijm
8249924485
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
lain
1ed8fbc4d9
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
lain
276a520163
CommonAPI: Create profile updates as public.
...
This saves us lots of sending out because we can use sharedInbox.
5 years ago