Commit Graph

95 Commits (1a4875adfa8fa8f65f1db7b4ec3cf868b7e3dee7)

Author SHA1 Message Date
Haelwenn (lanodan) Monnier 6da6540036
Bump copyright years of files changed after 2020-01-07
5 years ago
Alexander Strizhakov 29155137fd
renaming
5 years ago
Alexander Strizhakov 1630ecaa20
Merge branch 'develop' into admin-be
5 years ago
Alexander 5cacb988b9
partially settings update
5 years ago
Alex S 2753285b77
config editing through database
5 years ago
Ivan Tashkinov 7973cbdb9f OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
5 years ago
Maksim Pechnikov 95e6a2acd9 Merge branch 'develop' into issue/1342
5 years ago
Maksim Pechnikov 3fe7a1fd35 Merge branch 'develop' into issue/1342
5 years ago
Ivan Tashkinov 30caf3e51e Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Maksim Pechnikov a52da55eb9 added User.NotificationSetting struct
5 years ago
Ivan Tashkinov 1636cc5b7e Removed users.info and remaining usages.
5 years ago
Ivan Tashkinov de892d2fe1 [#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
5 years ago
Egor Kislitsyn 4c1dd55c48 Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
5 years ago
Maksim Pechnikov 243719a965 Merge branch 'develop' into feature/masto_api_markers
5 years ago
Egor Kislitsyn 4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
5 years ago
Ariadne Conill 4f82e42e4e websub: remove entirely
5 years ago
Maksim Pechnikov 66b5d0ff55 add Markers /api/v1/markers
5 years ago
Egor Kislitsyn 059005ff82
Replace `user.following` with Pleroma.FollowingRelationship
5 years ago
Ivan Tashkinov 64095961fe [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
Ariadne Conill c3d09921e4 test: factory: implement support for generating mock audio and listen objects
5 years ago
Ivan Tashkinov e6f43a831b [#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
5 years ago
Maksim Pechnikov 00abe099cd added tests for ActivityPub.like\unlike
5 years ago
lain cc6c0b4ba6 Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
5 years ago
lain 29807ef6a5 Merge branch 'feature/digest-email' into 'develop'
5 years ago
Sergey Suprunenko e8ad116c2a Do not add the "next" key to likes.json if there is no more items
5 years ago
Roman Chvanikov d2da3d30f3 Merge branch 'develop' into feature/digest-email
5 years ago
Mike Verdone 36012ef6c1 Require that ephemeral posts live for at least one hour
5 years ago
Mike Verdone 704960b3c1 Add support for activity expiration to common and Masto API
5 years ago
Mike Verdone 666514194a Add activity expirations table
5 years ago
Maxim Filippov f46805bb40 Merge branch 'develop' into feature/admin-api-user-statuses
5 years ago
Maksim c49a09ed88 tests for Pleroma.Web.ActivityPub.Publisher
5 years ago
Maxim Filippov 14ab2fd0f4 remove pry
5 years ago
Maxim Filippov a9459ff98f Admin API: Endpoint for fetching latest user's statuses
5 years ago
Roman Chvanikov eae991b06a merge develop
5 years ago
Alex S beba7bbc85 removing synchronization worker
5 years ago
Sergey Suprunenko ff55e3c16f Create mentions only for explicitly mentioned users
5 years ago
Ivan Tashkinov 46cf81a544 [#878] Formatting fix.
5 years ago
Ivan Tashkinov daff85a985 [#878] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.
5 years ago
Roman Chvanikov 657277ffc0 Resolve conflicts
5 years ago
Alex S 982cad0268 support for config groups
5 years ago
Alexander Strizhakov c2ca1f22a2 it is changed in compile time
5 years ago
Roman Chvanikov ce47017c89 Merge develop
5 years ago
Alexander Strizhakov 7ed682213f Fix/902 random compile failing
5 years ago
Sergey Suprunenko e2b3a27204 Add Reports to Admin API
5 years ago
Roman Chvanikov b6b5b16ba4 Merge develop
5 years ago
Roman Chvanikov bc7862106d Fix tests
6 years ago
lain 64c1c3a407 Participations: Add marking as read and unread.
6 years ago
lain d1da6b155a Conversation: Add Conversations and Participations.
6 years ago
Ivan Tashkinov bffddf5e31 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
eugenijm fc92a0fd8d Added limits and media attachments for scheduled activities.
6 years ago