Maksim Pechnikov
|
652cc6ba4b
|
updated ScheduledActivity
|
5 years ago |
|
Egor Kislitsyn
|
624e720aa4
|
Add `with_move` query param to the notifications API
|
5 years ago |
|
lain
|
7722e5a67a
|
Merge branch 'feature/move-activity' into 'develop'
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
|
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 |
|
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 |
|
Ivan Tashkinov
|
c31ddce51e
|
[#1335] Reorganized `users.mutes` as relation to UserMute entity.
|
5 years ago |
|
Egor Kislitsyn
|
3c0abfca53
|
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
|
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 |
|
Ivan Tashkinov
|
3db988250b
|
[#1335] User: refactored :blocks field into :blocked_users relation.
Introduced UserBlock.
|
5 years ago |
|
eugenijm
|
7888803ffe
|
Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`
|
5 years ago |
|
Maksim Pechnikov
|
4b7c11e3f9
|
excluded invisible actors from gets /api/v1/accounts/:id
|
5 years ago |
|
Egor Kislitsyn
|
4c1dd55c48
|
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
|
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 |
|
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
|
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 |
|
Maksim Pechnikov
|
189a288925
|
fix test
|
5 years ago |
|
Maksim Pechnikov
|
9694d51437
|
added test fo Pleroma.Web.MastodonAPI.StatusController
|
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
|
d379b48769
|
kill almost all of the OStatus module
|
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 |
|
eugenijm
|
a97b642289
|
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
|
5 years ago |
|
lain
|
cb8492962e
|
SearchController: Fix test.
Turns out you can't actually find the user with this.
|
5 years ago |
|
Egor Kislitsyn
|
059005ff82
|
Replace `user.following` with Pleroma.FollowingRelationship
|
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 |
|
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 |
|
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 |
|
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 |
|
eugenijm
|
8249924485
|
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
|
5 years ago |
|
kaniini
|
e07e9cb75e
|
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
This reverts merge request !1737
|
5 years ago |
|
eugenijm
|
06d9df79c5
|
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
|
5 years ago |
|
Ivan Tashkinov
|
64095961fe
|
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
|
5 years ago |
|
Egor Kislitsyn
|
e0c68eeb02
|
Move `:favourites` and `:bookmarks` actions to StatusController
|
5 years ago |
|
Egor Kislitsyn
|
7f2bc57725
|
Move `follows`, `mutes` and `blocks` actions to AccountController
|
5 years ago |
|
Egor Kislitsyn
|
1c6e1055c8
|
Add CustomEmojiController
|
5 years ago |
|
Egor Kislitsyn
|
c8b01f6667
|
Extract instance actions from `MastodonAPIController` to `InstanceController`
|
5 years ago |
|
kaniini
|
8557176808
|
Merge branch 'split-masto-api/auth' into 'develop'
Extract auth actions from `MastodonAPIController` to `AuthController`
See merge request pleroma/pleroma!1759
|
5 years ago |
|
Thibaut Girka
|
427d0c2a00
|
Store private announcements in object.data["announcements"], filter them on display
|
5 years ago |
|
Thibaut Girka
|
7d5a9f3f6d
|
Add tests for privately announcing statuses via API
|
5 years ago |
|
Egor Kislitsyn
|
af690d1033
|
Extract auth actions from `MastodonAPIController` to `AuthController`
|
5 years ago |
|
Egor Kislitsyn
|
2dad6dd020
|
Extract apps actions from `MastodonAPIController` to `AppController`
|
5 years ago |
|
Egor Kislitsyn
|
39695c4436
|
Extract suggestions actions from `MastodonAPIController` to `SuggestionController`
|
5 years ago |
|
Egor Kislitsyn
|
585bc57edb
|
Extract media actions from `MastodonAPIController` to `MediaController`
|
5 years ago |
|
Egor Kislitsyn
|
36a34c36fe
|
Extract poll actions from `MastodonAPIController` to `PollController`
|
5 years ago |
|
kPherox
|
f364438032
|
Add `rel="ugc"`
|
5 years ago |
|
kPherox
|
a0f101ee80
|
Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials
|
5 years ago |
|
Egor Kislitsyn
|
987e0b8be8
|
Move update_credentials to MastodonAPI.AccountController
|
5 years ago |
|
Egor Kislitsyn
|
c0ce2d5faf
|
Move account_register, relationships and verify_credentials to MastodonAPI.AccountController
|
5 years ago |
|
Egor Kislitsyn
|
38db4878a4
|
Disable async in DomainBlockControllerTest
|
5 years ago |
|
Egor Kislitsyn
|
3c5ecb70b4
|
Add PleromaAPI.AccountController
|
5 years ago |
|
Egor Kislitsyn
|
e7aef27c00
|
Fix merge
|
5 years ago |
|
Egor Kislitsyn
|
1207e88195
|
Fix ReportControllerTest
|
5 years ago |
|
kaniini
|
0e356cc800
|
Merge branch 'split-masto-api/reports' into 'develop'
Extract report actions from `MastodonAPIController` to `ReportController`
See merge request pleroma/pleroma!1744
|
5 years ago |
|
Egor Kislitsyn
|
b7f27a4f58
|
Extract report actions from `MastodonAPIController` to `ReportController`
Update MastodonAPI.ReportView
|
5 years ago |
|
Egor Kislitsyn
|
d4d88b3361
|
Extract conversation actions from `MastodonAPIController` to ConversationController
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
9202904da9
|
status_controller.ex: Posting media status without content defined
|
5 years ago |
|
rinpatch
|
374f83d29b
|
Fix not being able to post empty statuses with attachments
Attachment field was filled in after the empty status check
|
5 years ago |
|
kaniini
|
92d08d4113
|
Merge branch 'split-masto-api/follow-requests' into 'develop'
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
See merge request pleroma/pleroma!1730
|
5 years ago |
|
kaniini
|
68bf99baf2
|
Merge branch 'split-masto-api/domain-blocks' into 'develop'
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
See merge request pleroma/pleroma!1729
|
5 years ago |
|
kaniini
|
27a3221d57
|
Merge branch 'split-masto-api/scheduled-statuses' into 'develop'
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
See merge request pleroma/pleroma!1728
|
5 years ago |
|
Egor Kislitsyn
|
408750b94e
|
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
|
5 years ago |
|
Egor Kislitsyn
|
99c5a35890
|
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
|
5 years ago |
|
Egor Kislitsyn
|
0a5b106ddd
|
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
|
5 years ago |
|
Egor Kislitsyn
|
621377f378
|
Extract filter actions from `MastodonAPIController` to `FilterController`
|
5 years ago |
|
Egor Kislitsyn
|
5ea5c58a85
|
Move view logic from StatusController.context to StatusView and add a test
|
5 years ago |
|
Egor Kislitsyn
|
76b7e5cd5b
|
Move StatusController tests from MastodonAPIControllerTest to StatusControllerTest
|
5 years ago |
|
Egor Kislitsyn
|
3572cf29b7
|
Extract timeline actions from `MastodonAPIController` into `TimelineController`
|
5 years ago |
|
Egor Kislitsyn
|
a66a7a328f
|
Extract notification actions from `MastodonAPIController` into `NotificationController`
|
5 years ago |
|
Ivan Tashkinov
|
6f67aed3ac
|
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# lib/pleroma/web/admin_api/admin_api_controller.ex
|
5 years ago |
|
Egor Kislitsyn
|
95c948110c
|
Add `rel="ugc"` to hashtags and mentions
|
5 years ago |
|
Egor Kislitsyn
|
cf3041220a
|
Add support for `rel="ugc"`
|
5 years ago |
|
eugenijm
|
450bf7a63c
|
Mastodon API: Add a setting to hide follow/follower count from the user view (`hide_follows_count` and `hide_followers_count`)
|
5 years ago |
|
Ivan Tashkinov
|
e6f43a831b
|
[#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
|
5 years ago |
|
Egor Kislitsyn
|
019ced0558
|
Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers and test/web/mastodon_api/views
|
5 years ago |
|
Egor Kislitsyn
|
30510ade0e
|
Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests
|
5 years ago |
