Maksim Pechnikov
|
21a2a05407
|
Merge branch 'develop' into issue/1383
|
2020-01-28 20:39:20 +03:00 |
|
Maksim Pechnikov
|
02c3dd2e3d
|
update ecto
|
2020-01-28 10:43:47 +03:00 |
|
|
|
dabd535e43
|
Remove user recommendation by third party engine
|
2020-01-27 13:21:50 +00:00 |
|
Maksim Pechnikov
|
b8d5c09f48
|
Merge branch 'develop' into issue/1383
|
2020-01-22 09:30:30 +03:00 |
|
Maksim Pechnikov
|
6e88a7e591
|
exclude blocked user posts from search results
|
2020-01-21 07:40:13 +03:00 |
|
lain
|
2199d63ddc
|
StatusControllerTest: Fix typo
|
2020-01-20 15:31:14 +01:00 |
|
lain
|
510776ba31
|
CommonAPI: Don't error out on double favs/repeats
|
2020-01-20 14:27:59 +01:00 |
|
Egor Kislitsyn
|
023b7f605b
|
Fix notification controller test
|
2020-01-15 16:51:09 +04:00 |
|
Egor Kislitsyn
|
3849053c6a
|
Merge branch 'develop' into notifications-from-account
|
2020-01-15 16:49:45 +04:00 |
|
Maksim Pechnikov
|
b7908844f2
|
Merge branch 'develop' into issue/1383
|
2020-01-13 12:41:07 +03:00 |
|
Ivan Tashkinov
|
455e072d27
|
[#2068] Introduced proper OAuth tokens usage to controller tests.
|
2019-12-19 17:23:27 +03:00 |
|
Egor Kislitsyn
|
34d85f8a54
|
Return 404 if account to filter notifications from is not found
|
2019-12-19 20:45:44 +07:00 |
|
Egor Kislitsyn
|
6c39fa20b1
|
Add support for account_id param to filter notifications by the account
|
2019-12-17 17:00:46 +07:00 |
|
Ivan Tashkinov
|
7973cbdb9f
|
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
|
2019-12-15 22:32:42 +03:00 |
|
Maksim Pechnikov
|
67cb46e15d
|
Merge branch 'develop' into issue/1383
|
2019-12-14 21:44:10 +03:00 |
|
rinpatch
|
37c34ccec3
|
Merge branch 'fix/prefer-url-over-search' into 'develop'
status search: prefer the status fetched by url over other results
See merge request pleroma/pleroma!2050
|
2019-12-09 17:55:48 +00:00 |
|
rinpatch
|
f4b7f32d51
|
status search: prefer the status fetched by url over other results
|
2019-12-09 20:45:04 +03:00 |
|
Maksim Pechnikov
|
2b821036c4
|
Merge branch 'develop' into issue/1383
|
2019-12-09 19:41:43 +03:00 |
|
lain
|
b3c80b8404
|
Merge branch 'exclude-visibilities-for-like-notifications' into 'develop'
Fix exclude_visibilities filter for followers-only Like notifications
See merge request pleroma/pleroma!1957
|
2019-12-09 14:55:42 +00:00 |
|
Maksim Pechnikov
|
5876a9cb79
|
Merge branch 'develop' into issue/1383
|
2019-12-08 19:52:46 +03:00 |
|
rinpatch
|
8404f8c8fb
|
Merge branch 'improve-move-notificaions-api' into 'develop'
Add `with_move` query param to the notifications API
See merge request pleroma/pleroma!2032
|
2019-12-08 13:07:05 +00:00 |
|
lain
|
e8cee4d9a0
|
ActivityPub: For user timelines, respects blocks.
Unless the timeline belongs to a blocked user.
|
2019-12-06 14:25:13 +01:00 |
|
Maksim Pechnikov
|
3c3bba0b7c
|
fix ScheduledActivity
|
2019-12-04 21:18:05 +03:00 |
|
Ivan Tashkinov
|
30caf3e51e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# lib/pleroma/user.ex
|
2019-12-04 18:56:31 +03:00 |
|
Maksim Pechnikov
|
29a98b86b7
|
Merge branch 'develop' into issue/1383
|
2019-12-04 09:34:44 +03:00 |
|
Maksim Pechnikov
|
652cc6ba4b
|
updated ScheduledActivity
|
2019-12-04 09:12:17 +03:00 |
|
Egor Kislitsyn
|
624e720aa4
|
Add with_move query param to the notifications API
|
2019-12-03 22:13:38 +07:00 |
|
lain
|
7722e5a67a
|
Merge branch 'feature/move-activity' into 'develop'
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
|
2019-12-02 16:26:19 +00:00 |
|
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
|
2019-11-21 16:47:52 +03:00 |
|
lain
|
8feb5dcb42
|
Merge branch 'issue/1348' into 'develop'
[#1348] excluded invisible actors from gets /api/v1/accounts/:id
See merge request pleroma/pleroma!1937
|
2019-11-21 13:13:14 +00:00 |
|
Ivan Tashkinov
|
4f88b1b435
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
|
2019-11-20 15:47:11 +03:00 |
|
Egor Kislitsyn
|
63711258ce
|
Fix sporadically failing test
|
2019-11-20 14:25:00 +07:00 |
|
Ivan Tashkinov
|
ba5cc30165
|
[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
|
2019-11-19 23:22:10 +03:00 |
|
Ivan Tashkinov
|
c31ddce51e
|
[#1335] Reorganized users.mutes as relation to UserMute entity.
|
2019-11-15 21:38:54 +03:00 |
|
Egor Kislitsyn
|
3c0abfca53
|
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
|
2019-11-14 16:39:45 +07:00 |
|
Egor Kislitsyn
|
e6d7e27bd6
|
Add allow_following_move setting to User
|
2019-11-12 18:45:28 +07:00 |
|
eugenijm
|
f86a7d5d8b
|
Fix exclude_visibilities filter for followers-only Like notifications
|
2019-11-11 23:57:30 +03:00 |
|
Ivan Tashkinov
|
3db988250b
|
[#1335] User: refactored :blocks field into :blocked_users relation.
Introduced UserBlock.
|
2019-11-10 16:30:21 +03:00 |
|
eugenijm
|
7888803ffe
|
Mastodon API: Add the recipients parameter to GET /api/v1/conversations
|
2019-11-07 08:26:24 +03:00 |
|
Maksim Pechnikov
|
4b7c11e3f9
|
excluded invisible actors from gets /api/v1/accounts/:id
|
2019-11-04 20:44:24 +03:00 |
|
Egor Kislitsyn
|
4c1dd55c48
|
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
|
2019-10-24 14:55:36 +07:00 |
|
Ivan Tashkinov
|
8cc809e44e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# lib/pleroma/notification.ex
|
2019-10-23 17:22:42 +03:00 |
|
Maksim Pechnikov
|
243719a965
|
Merge branch 'develop' into feature/masto_api_markers
|
2019-10-21 11:32:28 +03:00 |
|
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
|
2019-10-21 11:05:09 +03:00 |
|
Egor Kislitsyn
|
4ea1a61b00
|
Merge branch 'develop' into refactor/following-relationships
|
2019-10-21 14:19:15 +07:00 |
|
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
|
2019-10-20 22:29:56 +03:00 |
|
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
|
2019-10-20 20:43:18 +03:00 |
|
Ariadne Conill
|
05c58eaece
|
change Maksim's test description
|
2019-10-19 23:23:13 +00:00 |
|
Maksim Pechnikov
|
189a288925
|
fix test
|
2019-10-19 23:21:37 +00:00 |
|
Maksim Pechnikov
|
9694d51437
|
added test fo Pleroma.Web.MastodonAPI.StatusController
|
2019-10-19 23:21:37 +00:00 |
|
