1207e88195
Fix ReportControllerTest
2019-09-30 18:30:10 +07:00
26f66fb70a
Merge branch 'features/apc2s-media-upload' into 'develop'
...
AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706
2019-09-30 11:21:49 +00:00
0e356cc800
Merge branch 'split-masto-api/reports' into 'develop'
...
Extract report actions from `MastodonAPIController` to `ReportController`
See merge request pleroma/pleroma!1744
2019-09-30 11:17:30 +00:00
74d8fadf37
Merge branch 'split-masto-api/conversations' into 'develop'
...
Extract conversation actions from `MastodonAPIController` to ConversationController
See merge request pleroma/pleroma!1743
2019-09-30 10:49:40 +00:00
b7f27a4f58
Extract report actions from `MastodonAPIController` to `ReportController`
...
Update MastodonAPI.ReportView
2019-09-30 17:44:10 +07:00
1d7cbdaf7b
change new scrobble endpoint
2019-09-30 10:39:48 +00:00
211008ae2f
test: fix scrobble controller tests
2019-09-30 10:39:48 +00:00
71eff09e56
common api: make sure the generated IR is actually federatable
2019-09-30 10:39:48 +00:00
e7309d3b60
test: transmogrifier: add test proving that transmogrifier can handle outgoing listens
2019-09-30 10:39:48 +00:00
7cad6ea67a
pleroma api: hook up scrobbler controller
2019-09-30 10:39:17 +00:00
2c82d8603b
common api: implement scrobbling
2019-09-30 10:39:17 +00:00
172c74a77b
activitypub: transmogrifier: implement support for Listen activities
2019-09-30 10:39:17 +00:00
1f9de2a8cd
activitypub: implement IR-level considerations for Listen activities
2019-09-30 10:39:17 +00:00
b7877e9b1c
mastodon api: implement rendering of listen activities
2019-09-30 10:39:17 +00:00
c3d09921e4
test: factory: implement support for generating mock audio and listen objects
2019-09-30 10:39:17 +00:00
d4d88b3361
Extract conversation actions from `MastodonAPIController` to ConversationController
2019-09-30 16:52:07 +07:00
e9d1aa75d5
Revert subscription refactoring.
...
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10c4fbb56984
2019-09-29 18:43:27 +03:00
6d74a7528c
Merge branch 'feature/follow-requests-count' into 'develop'
...
Mastodon API: add follow_requests_count
See merge request pleroma/pleroma!1726
2019-09-29 11:44:31 +00:00
1053319cd6
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-28 10:36:04 +03:00
9202904da9
status_controller.ex: Posting media status without content defined
2019-09-28 01:53:41 +02:00
374f83d29b
Fix not being able to post empty statuses with attachments
...
Attachment field was filled in after the empty status check
2019-09-28 01:58:06 +03:00
f9380289eb
Add `remote_ip` plug
2019-09-27 21:59:23 +00:00
92d08d4113
Merge branch 'split-masto-api/follow-requests' into 'develop'
...
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
See merge request pleroma/pleroma!1730
2019-09-27 07:54:54 +00:00
68bf99baf2
Merge branch 'split-masto-api/domain-blocks' into 'develop'
...
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
See merge request pleroma/pleroma!1729
2019-09-27 07:54:08 +00:00
27a3221d57
Merge branch 'split-masto-api/scheduled-statuses' into 'develop'
...
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
See merge request pleroma/pleroma!1728
2019-09-27 07:53:22 +00:00
408750b94e
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
2019-09-27 14:28:05 +07:00
99c5a35890
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
2019-09-27 14:25:17 +07:00
0a5b106ddd
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
2019-09-27 13:36:28 +07:00
621377f378
Extract filter actions from `MastodonAPIController` to `FilterController`
2019-09-27 13:06:25 +07:00
91e2bcf218
Merge branch 'refactor/status-controller' into 'develop'
...
Extract status actions from `MastodonAPIController` to `StatusController`
See merge request pleroma/pleroma!1719
2019-09-27 04:37:48 +00:00
14294243a2
mastodon api: implement follow_requests_count
2019-09-27 04:22:40 +00:00
5ea5c58a85
Move view logic from StatusController.context to StatusView and add a test
2019-09-27 10:52:47 +07:00
76b7e5cd5b
Move StatusController tests from MastodonAPIControllerTest to StatusControllerTest
2019-09-27 10:52:47 +07:00
eb9aa7aa10
Merge branch 'refactor/subscription' into 'develop'
...
Refactor subscription functionality
Closes #1130
See merge request pleroma/pleroma!1664
2019-09-27 03:51:24 +00:00
98d1347a4e
Extract status actions from `MastodonAPIController` into `StatusController`
2019-09-27 10:51:15 +07:00
dc0fdb5e84
Merge branch 'refactor/timeline-controller' into 'develop'
...
Extract timeline actions from `MastodonAPIController` into `TimelineController`
See merge request pleroma/pleroma!1648
2019-09-27 03:42:30 +00:00
b4fc96f640
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-26 20:56:59 +03:00
e7836adf21
Merge branch 'develop' into feature/moderation-log-filters
2019-09-26 19:01:54 +03:00
3d722dc200
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-26 16:16:30 +03:00
75290cbfbd
Add Pleroma.JobQueueMonitor
2019-09-26 18:49:57 +07:00
b4b147000c
Merge develop
2019-09-26 10:38:54 +03:00
3572cf29b7
Extract timeline actions from `MastodonAPIController` into `TimelineController`
2019-09-26 10:53:42 +07:00
6abe12dced
Merge branch 'refactor/notification-controller' into 'develop'
...
Extract notification actions from `MastodonAPIController` into `NotificationController`
See merge request pleroma/pleroma!1646
2019-09-26 03:13:22 +00:00
a39e065916
Merge branch 'feature/return-link-for-password-reset' into 'develop'
...
Admin API: Return link alongside with token on password reset
See merge request pleroma/pleroma!1691
2019-09-26 03:12:03 +00:00
48a82c4609
Merge branch 'refactor/user' into 'develop'
...
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
2019-09-26 03:00:38 +00:00
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
2019-09-26 02:57:41 +00:00
3ff57f1fd3
Merge branch 'hex-flake-id' into 'develop'
...
Replace `Pleroma.FlakeId` with `flake_id` hex package
See merge request pleroma/pleroma!1692
2019-09-26 02:51:54 +00:00
beabc49e35
Merge branch 'feature/activities-pagination-by-offset' into 'develop'
...
Allow activities pagination via limit/offset
See merge request pleroma/pleroma!1714
2019-09-26 02:49:45 +00:00
1b9cd4c866
Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop'
...
Don't embed the first page in inboxes/outboxes and refactor the views to follow View/Controller pattern
See merge request pleroma/pleroma!1716
2019-09-26 00:03:47 +00:00
16487716af
Merge branch 'support/test' into 'develop'
...
clears `robot.txt` after tests
See merge request pleroma/pleroma!1715
2019-09-25 18:51:45 +00:00
dd4263da5a
Apply suggestion to test/tasks/instance_test.exs
2019-09-25 17:47:22 +00:00
d87be2ec96
Don't embed the first page in inboxes/outboxes and refactor the views to
...
follow View/Controller pattern
Note that I mentioned the change in 1.1 section because I intend to
backport this, if this is not needed I will move it back to Unreleased.
2019-09-25 15:59:04 +03:00
118d6dcdf4
Fix nodeinfo handling
2019-09-25 12:32:19 +02:00
ba9d35a904
Add an API endpoint for listing remote packs
2019-09-25 12:32:19 +02:00
1b2e4a0ae0
clears `robot.txt` after tests
2019-09-25 13:27:31 +03:00
b5dfe83433
Replace `Pleroma.FlakeId` with `flake_id` hex package
2019-09-25 17:14:31 +07:00
1a858134ed
Merge branch 'develop' into issue/1218
2019-09-25 12:24:12 +03:00
60cbea5bb2
Allow activities pagination via limit/offset
2019-09-25 01:25:42 +03:00
0dc8f3d6d2
/api/ap/uploadMedia → /api/ap/upload_media
2019-09-24 19:03:06 +02:00
209395c7e6
Add User.change_info/2 and User.update_info/2
2019-09-24 19:50:07 +07:00
5e9759cd7d
Merge branch 'develop' into feature/return-link-for-password-reset
2019-09-24 13:00:48 +03:00
a66a7a328f
Extract notification actions from `MastodonAPIController` into `NotificationController`
2019-09-24 15:16:44 +07:00
79b25be4e1
Do not return tuple when unneeded
2019-09-24 15:03:20 +07:00
d75d0ae134
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-24 08:06:04 +03:00
29dd8ab9c0
Merge branch 'feature/force-password-reset' into 'develop'
...
Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705
2019-09-23 22:42:34 +00:00
19263f30c3
Merge branch 'support-rel-ugc' into 'develop'
...
Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679
2019-09-23 22:41:31 +00:00
760df67a7b
Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'
...
Fix private and direct statuses not being filtered out from the public timeline for an authenticated user.
Closes #1223
See merge request pleroma/pleroma!1703
2019-09-23 22:35:09 +00:00
ad9595ca55
Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'
...
added tests /activity_pub/transmogrifier.ex
See merge request pleroma/pleroma!1651
2019-09-23 22:34:52 +00:00
e1d2d69c87
Clean up views
2019-09-23 22:33:59 +00:00
494bb6bac6
updated tests
2019-09-23 22:37:30 +03:00
179fa32dd5
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-23 21:41:57 +03:00
38245f1336
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-23 21:32:50 +03:00
fd48bd80eb
Merge branch 'better-emoji-packs' into 'develop'
...
Shareable emoji packs
Closes #833 and #1096
See merge request pleroma/pleroma!1551
2019-09-23 18:20:08 +00:00
6b3d5ed6db
Emoji API Controller: Follow phoenix directory structure
2019-09-23 21:14:51 +03:00
815b904508
Add support for AP C2S uploadMedia
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171
2019-09-23 20:00:12 +02:00
2ad50583f0
Document and test /api/ap/whoami
2019-09-23 19:47:35 +02:00
02bbcd6180
Merge branch 'develop' into feature/return-link-for-password-reset
2019-09-22 16:58:39 +03:00
72a01f1350
Use router helper to generate reset password link
2019-09-22 16:36:59 +03:00
6f25668215
Admin API: Add ability to force user's password reset
2019-09-22 16:08:07 +03:00
7cf1252455
Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
2019-09-20 18:27:00 +03:00
b80c41a14f
Merge branch 'outbox_pagination' into 'develop'
...
Fix AP outbox pagination
See merge request pleroma/pleroma!1700
2019-09-19 16:53:59 +00:00
9aca2cc95d
Add test for correct AP outbox pagination
2019-09-19 16:49:27 +02:00
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
2019-09-19 10:59:09 +03:00
95c948110c
Add `rel="ugc"` to hashtags and mentions
2019-09-19 14:56:10 +07:00
cf3041220a
Add support for `rel="ugc"`
2019-09-19 14:56:10 +07:00
fe5e0b7846
Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)
2019-09-19 08:59:25 +03:00
d4ed3a35b8
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-19 07:35:34 +03:00
f95a2b2cda
Merge branch 'issue/733' into 'develop'
...
[#733 ] added test for Ostatus
See merge request pleroma/pleroma!1657
2019-09-18 22:28:10 +00:00
b0ec82d24a
Merge branch 'chores/bump-copyright-year' into 'develop'
...
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
2019-09-18 21:57:49 +00:00
447514dfa2
Bump copyright years of files changed in 2019
...
Done via the following command:
git diff 1e6c102bfc
2019-09-18 23:21:11 +02:00
b585134c90
Get the nodeinfo address from the well-known
2019-09-19 00:16:34 +03:00
a1325d5fd9
Change path from nodeinfo to metadata->features
2019-09-19 00:16:34 +03:00
36f2275dc9
A feature for shareable emoji packs, use it in download_from & tests
2019-09-19 00:16:33 +03:00
74fb6d8647
Move EmojiAPIController from EmojiAPI to PleromaAPI
2019-09-19 00:16:33 +03:00
6cd651a38b
Make the emoji controller api more RESTy
2019-09-19 00:16:33 +03:00
7c784128fd
Change emoji api responses to JSON
2019-09-19 00:16:33 +03:00
9eb2ee4df0
Allow importing old (emoji.txt / plain) packs from the filesystem
2019-09-19 00:16:33 +03:00
f5131540dc
Add a way to create emoji packs via an endpoint
2019-09-19 00:16:33 +03:00
8dbdd5c280
Allow uploading new emojis to packs from URLs
2019-09-19 00:16:33 +03:00
9afe7258dd
Implememt emoji pack file updating + write tests
2019-09-19 00:16:33 +03:00
9dc9689144
Add tests for pack metadata updating
2019-09-19 00:16:33 +03:00
adf31d596e
Add tests for downloading from fallback url
2019-09-19 00:16:33 +03:00
2a94eca096
Change YAML to JSON
2019-09-19 00:16:33 +03:00
2d4b8f3d20
Add an endpoint for deleting emoji packs
2019-09-19 00:16:33 +03:00
7e4c8b56ea
Add tests for emoji pack sharing
2019-09-19 00:16:33 +03:00
ab2ca3038f
Merge branch 'hide-follower-following-count' into 'develop'
...
Add a setting to hide follows/followers stats from the user profile
See merge request pleroma/pleroma!1663
2019-09-18 21:13:15 +00:00
25b4365656
Merge branch 'admin_api_invite_tokens' into 'develop'
...
POST for creating invite tokens in admin api
See merge request pleroma/pleroma!1637
2019-09-18 21:11:37 +00:00
220afadc55
Merge branch 'restore-tests' into 'develop'
...
Restore tests for `change_password` and `delete_account`
See merge request pleroma/pleroma!1658
2019-09-18 21:05:18 +00:00
56286447ee
Merge branch 'fix/test-upload-cleanup' into 'develop'
...
Cleanup uploads after the tests are finished
See merge request pleroma/pleroma!1695
2019-09-18 21:00:09 +00:00
a12aeb09c4
Cleanup uploads after the tests are finished
2019-09-18 23:34:13 +03:00
eb87a86b5b
Preserve internal fields when reinjecting
2019-09-18 19:53:51 +03:00
84a40f6f26
Capture log in object refetch tests
2019-09-18 18:31:24 +03:00
7ef575d11e
Initial poll refresh support
...
Implement refreshing the object with an interval and call the function
when getting the poll.
2019-09-18 18:13:21 +03:00
4faf2b1555
post for creating invite tokens in admin api
2019-09-18 10:49:14 +03:00
b17f217bf3
[ #1234 ] Addressed code analysis issue.
2019-09-17 23:31:05 +03:00
01c1078015
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-17 22:53:26 +03:00
0447c42715
Merge branch 'develop' into issue/733
2019-09-17 22:20:39 +03:00
76068873db
[ #1234 ] Defined admin OAuth scopes, refined other scopes. Added tests.
2019-09-17 22:19:39 +03:00
ef2e2c5e12
Merge branch 'feature/return-total-for-reports' into 'develop'
...
Admin API: Return total for reports
See merge request pleroma/pleroma!1628
2019-09-17 19:09:56 +00:00
7dd51652f9
Merge branch 'develop' into issue/733
2019-09-17 21:20:08 +03:00
95a4a19417
Merge branch 'support/tests' into 'develop'
...
add tests for activity_pub/utils.ex
See merge request pleroma/pleroma!1627
2019-09-17 14:47:26 +00:00
80c5c3495b
remove remaining errors from tests
2019-09-17 14:44:52 +00:00
e9f69a3eb7
Move pleroma_api controllers into controllers sub-folders
2019-09-17 16:52:23 +03:00
7d1773bc6b
Rename SubscriptionNotificationController list and get actions to index and show
2019-09-17 16:48:24 +03:00
015597c2ab
Apply suggestion to test/web/pleroma_api/subscription_notification_controller_test.exs
2019-09-17 13:43:15 +00:00
450bf7a63c
Mastodon API: Add a setting to hide follow/follower count from the user view (`hide_follows_count` and `hide_followers_count`)
2019-09-17 14:45:47 +03:00
6042e21b25
Move subscription notifications to a separate controller
2019-09-16 21:59:49 +03:00
76c3e290fc
Merge develop
2019-09-16 20:30:42 +03:00
df15ed13d1
Merge branch 'develop' into feature/moderation-log-filters
2019-09-16 19:44:06 +03:00
219dca1b00
Merge branch 'develop' into feature/return-total-for-reports
2019-09-16 14:40:17 +03:00
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd331264fabf83ad0
2019-09-16 17:55:04 +07:00
e8120944d8
Fix signed fetch inclusion publisher test
...
Oban branch changed `actor` to `actor_id` and this test was not adjusted for that
2019-09-16 13:23:06 +03:00
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
2019-09-16 09:09:21 +00:00
aab264db82
Streamer refactoring
2019-09-16 07:44:03 +00:00
17142a3720
Merge branch 'feature/delivery-tracking' into 'develop'
...
Track signed fetches of objects and use them for delete federation
See merge request pleroma/pleroma!1661
2019-09-16 07:39:58 +00:00
ca88e37a8f
Fix a race condition in tests
2019-09-16 12:55:05 +07:00
43f17c2e67
Restore tests for `change_password` and `delete_account`
2019-09-16 12:34:47 +07:00
d75bc728e7
Merge branch 'develop' into issue/733
2019-09-16 07:34:22 +03:00
efbc2edba1
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub_controller.ex
# lib/pleroma/web/router.ex
2019-09-15 18:52:27 +03:00
e6f43a831b
[ #1234 ] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
2019-09-15 18:22:08 +03:00
8751809e1e
Merge branch 'develop' into support/tests
2019-09-15 14:22:15 +03:00
610236d6be
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
2019-09-15 10:12:24 +03:00
62bbba80f3
Merge branch 'fix/truncate-remote-user-fields' into 'develop'
...
Truncate remote user fields
See merge request pleroma/pleroma!1619
2019-09-14 16:39:42 +00:00
d7457c9165
Merge branch 'develop' into refactor/subscription
2019-09-14 18:29:51 +03:00
6bcedb693c
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
# mix.lock
2019-09-14 16:11:44 +03:00
b870ae08fd
Fix `Activity.all_by_actor_and_id/2` test
2019-09-14 19:31:20 +07:00
a78a7ee455
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
2019-09-14 10:50:08 +00:00
85b6144ffd
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
2019-09-14 10:46:35 +00:00
5c5ebd3861
Mastodon API: Respect post privacy in favourited/reblogged endpoints
2019-09-14 01:50:15 +03:00
a9b78f55e3
Merge branch 'capture-test-errors' into 'develop'
...
Capture test error messages where appropriate
See merge request pleroma/pleroma!1665
2019-09-13 17:07:14 +00:00
ba70a8cae6
Merge branch 'develop' into feature/delivery-tracking
2019-09-13 19:42:53 +03:00
25a64a4aa0
Capture test error messages where appropriate
2019-09-13 11:46:41 -04:00
0bd2b85edb
Separate Subscription Notifications from regular Notifications
2019-09-13 18:25:27 +03:00
53a3ad6043
Merge branch 'cleanup-activity' into 'develop'
...
Cleanup `Pleroma.Activity` and add more tests
See merge request pleroma/pleroma!1623
2019-09-13 14:48:00 +00:00
a7f31bf06c
Merge remote-tracking branch 'origin/develop' into reactions
2019-09-13 16:31:27 +02:00
e5b3ad3d04
ActivityPub: Use is_unicode_emoji? function.
2019-09-13 16:06:34 +02:00
0d9609894f
Merge branch 'feature/change-email' into 'develop'
...
Add email change endpoint
Closes #1156
See merge request pleroma/pleroma!1580
2019-09-13 12:46:16 +00:00
f884987ace
Merge branch 'admin-config-description' into 'develop'
...
Admin config description
Closes #1178 and #1209
See merge request pleroma/pleroma!1611
2019-09-13 12:36:24 +00:00
bc3e8c033b
fix formatting
2019-09-13 15:06:34 +03:00
ec5aaf5bd7
fix tests
2019-09-13 14:59:58 +03:00
fb96facc32
Remove unused functions and fix credo issues
2019-09-13 12:29:42 +03:00
ce23529d91
Use delivery info when federating deletes
2019-09-13 11:38:17 +03:00
25d8216804
Add email change endpoint
2019-09-13 13:09:35 +07:00
5bfbad13ad
Add more tests for Pleroma.Activity
2019-09-13 12:49:52 +07:00
39dc9b470c
Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils
2019-09-13 12:44:59 +07:00
d8a178274b
fix Activity.get_by_id
2019-09-13 07:12:34 +03:00
58b17196fa
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
2019-09-13 03:58:58 +00:00
2b40e57a72
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-13 06:55:05 +03:00
a697f0d791
Emoji: Add function to detect if a character is an emoji
2019-09-13 02:11:02 +02:00
936951826e
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-12 22:15:43 +03:00
769fb778d4
Track object/create activity fetches
2019-09-12 21:37:36 +03:00
102eb4455c
Fix associated test as well
2019-09-12 12:29:08 -05:00
8d4b661ecb
Transmogrifier: Strip internal emoji reaction fields.
2019-09-12 18:59:13 +02:00
05e9776517
PleromaAPIController: Add endpoint to fetch emoji reactions.
2019-09-12 18:48:25 +02:00
4f548cb2b7
added test for Ostatus
2019-09-12 10:25:43 +03:00
007e0c1ce1
added tests
2019-09-11 23:19:06 +03:00
a1f2dfb10a
expanding regex sigils to use modifiers
2019-09-11 09:25:33 +03:00
fcf604fa43
added tests
2019-09-11 07:23:33 +03:00
3d12e05f43
Fix `Activity.all_by_ids_with_object/1` test
2019-09-11 01:08:37 +07:00
a31af93e1d
added tests /activity_pub/transmogrifier.ex
2019-09-10 16:43:10 +03:00
b40b10b53d
Add an endpoint to get multiple statuses by IDs
2019-09-10 13:39:45 +07:00
d1abf7a358
Merge branch 'develop' into feature/moderation-log-filters
2019-09-10 01:23:20 +03:00
11e12b5761
Add Pleroma.Plugs.Cache
2019-09-09 18:53:08 +00:00
e0f84d0043
Fix `ActivityPubController.read_inbox/2`
2019-09-10 01:11:57 +07:00
b63faf9819
[ #1234 ] Mastodon 2.4.3 hierarchical scopes initial support (WIP).
2019-09-08 15:00:03 +03:00
39f99dc6cd
Merge branch 'develop' into support/tests
2019-09-07 22:13:43 +03:00
ab2f21e470
tests for mastodon_api_controller.ex
2019-09-06 21:50:00 +03:00
eb74c3d5c7
Merge branch 'develop' into issue/1218
2019-09-06 14:01:07 +03:00
ca1ba1e272
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
2019-09-06 13:26:05 +03:00
896ffabe37
Merge branch 'so-long-twitterapi' into 'develop'
...
Removing TwitterAPI
See merge request pleroma/pleroma!1605
2019-09-06 08:43:38 +00:00
fe7cf44c40
Merge branch 'feature/mastoapi-accounts-external' into 'develop'
...
Mastdon API: Add ability to get a remote account by nickname to `/api/v1/accounts/:id`
See merge request pleroma/pleroma!1622
2019-09-05 12:48:27 +00:00
b312ca3d52
Mastodon API Poll view: Fix handling of polls without an end date
2019-09-05 12:03:39 +03:00
79cf629e1a
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-09-05 11:30:41 +03:00
99ea990a16
PleromaAPIController: Add emoji reactions.
2019-09-04 12:20:35 -05:00
af746fa4a8
Return total for reports
2019-09-04 20:08:13 +03:00
3542ca6702
Merge branch 'develop' into feature/moderation-log-filters
2019-09-04 19:40:07 +03:00
2975da284b
truncate remote user bio/display name
2019-09-04 15:45:40 +01:00
8cbad5500c
add tests for activity_pub/utils.ex
2019-09-04 15:25:12 +03:00
3face45467
Mastodon API: Add `pleroma.thread_muted` to Status entity
...
Needed for pleroma-fe!941
2019-09-04 14:17:23 +03:00
c2b6c1b089
Extend `/api/pleroma/notifications/read` to mark multiple notifications
...
as read and make it respond with Mastoapi entities
2019-09-04 12:38:27 +03:00
9bc12b88b3
ActivityPub: Save emoji reactions in object.
2019-09-03 16:50:04 -05:00
cc1d1ee406
Mastdon API: Add ability to get a remote account by nickname to
...
`/api/v1/accounts/:id`
2019-09-03 19:26:10 +03:00
eb17cc17a1
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# CHANGELOG.md
2019-09-03 17:12:15 +03:00
b15cfd80ef
Return "total" optionally
2019-09-03 13:58:27 +03:00
a4c5f71e93
Return total from pagination + tests
2019-09-02 22:48:52 +03:00
b49085c156
[ #1149 ] Refactoring: GenServer workers renamed to daemons, `use Oban.Worker` moved to helper.
2019-09-02 14:57:40 +03:00
e73685834c
add mandatory fields for user update
2019-09-02 12:35:55 +01:00
05c935c396
mix format
2019-09-02 12:15:40 +01:00
35ef470d00
truncate fields for remote users instead
2019-09-02 12:15:21 +01:00
6c2fd1b78b
Fix tests
2019-09-01 21:38:15 +03:00
a90ea8ba15
[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).
2019-08-31 19:08:56 +03:00
e890ea7e82
[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# config/config.exs
2019-08-31 14:25:43 +03:00
9cabc02864
Remove a useless import
2019-08-31 10:57:35 +03:00
dbfcba85ec
Add a changelog entry for twitterapi removal and fix credo issues
2019-08-31 10:45:37 +03:00
64410497d2
Remove TwitterAPI representers
2019-08-31 10:41:15 +03:00
985122cc03
Remove Activity, User and Notification views from TwitterAPI
2019-08-31 10:31:15 +03:00
90c2dae9a4
Remove most of Pleroma.Web.TwitterAPI.TwitterAPI
2019-08-31 10:20:34 +03:00
6ef0103ca0
added Emoji struct
2019-08-31 10:14:53 +03:00
f182f0f6bd
Add ability to search moderation logs
2019-08-31 00:57:15 +03:00
d8098d142a
added Emoji.Formatter
2019-08-30 22:04:17 +03:00
d7808b5db4
added code\path fields without html tags in ets
2019-08-30 07:30:54 +03:00
cef2e980b1
division emoji.ex on loader.ex and emoji.ex
2019-08-30 07:30:54 +03:00
d9d7765383
Merge branch 'fix-osada-follow' into 'develop'
...
Transmogrifier: Fix follow handling when the actor is an object.
Closes #1211
See merge request pleroma/pleroma!1604
2019-08-28 07:10:35 +00:00
b770ed1d99
CommonAPI: Support emoji reactions.
2019-08-27 17:56:28 -05:00
f017260cdc
Merge remote-tracking branch 'origin/develop' into reactions
2019-08-27 16:38:51 -05:00
66519f2100
Merge branch 'list-controller' into 'develop'
...
Extract list actions from `MastodonAPIController` into `ListController`
See merge request pleroma/pleroma!1600
2019-08-27 21:15:54 +00:00
5e4fde1d3d
Filter logs by date
2019-08-27 20:48:16 +03:00
00abe099cd
added tests for ActivityPub.like\unlike
2019-08-27 16:21:03 +03:00
eb1739c596
Remove most of TwitterAPIController
2019-08-27 12:29:19 +03:00
a0b21c8928
Transmogrifier: Handle incoming emoji reactions.
2019-08-26 16:47:31 -05:00
6e1ec4c5da
ActivityPub: Basic EmojiReactions.
2019-08-26 16:29:51 -05:00
3da65292b3
Transmogrifier: Fix follow handling when the actor is an object.
2019-08-26 14:34:52 -05:00
c338224c93
Fix sporadic test
2019-08-26 17:24:22 +03:00
019ced0558
Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers and test/web/mastodon_api/views
2019-08-26 19:37:57 +07:00
30510ade0e
Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests
2019-08-26 19:37:54 +07:00
3b1b631c2a
Add validation in Pleroma.List.create/2
2019-08-26 18:59:57 +07:00
eb75ea502d
Update test for custom fields when content-type urlencoded
2019-08-26 16:55:26 +09:00
6dc24422dc
Merge branch 'issue/1177' into 'develop'
...
[#1177 ] fixed unfollow for relay actor
See merge request pleroma/pleroma!1589
2019-08-25 19:43:27 +00:00
37dd3867bb
Log admin/moderator actions
2019-08-25 19:39:37 +00:00
503139b343
Merge branch 'fix-all-custom-fields-deleted' into 'develop'
...
Fix not to use unupdated attachments when all fields are deleted
See merge request pleroma/pleroma!1596
2019-08-25 19:35:28 +00:00
b8777b01ae
Update test for custom fields when name empty string
2019-08-26 03:30:31 +09:00
d74efde94e
Update test for custom profile fields
2019-08-26 02:06:52 +09:00
5e7098cf69
Merge branch 'bugfix/rel_me_missing_mocks' into 'develop'
...
Implement missing mocks for rel=me
See merge request pleroma/pleroma!1598
2019-08-25 16:12:13 +00:00
20c3f613d8
HttpRequestMock: Remove useless `error = error`
2019-08-25 08:55:29 +02:00
f3b1266273
user_test.exs: fix rel=me tests
2019-08-25 08:48:38 +02:00
211e163770
Implement missing mocks for rel=me
2019-08-25 08:03:25 +02:00
e22737ffb5
HttpRequestMock: Improve non-implemented error message
2019-08-25 07:33:46 +02:00
18668447d2
HttpRequestMock: Log mock errors as warnings
2019-08-25 07:33:13 +02:00
45e21a9df4
Rename fields to fields_attributes
2019-08-25 07:34:11 +09:00
90986667ce
Merge branch 'admin-create-users' into 'develop'
...
user creation admin api will create multiple users
See merge request pleroma/pleroma!1170
2019-08-24 16:04:19 +00:00
efb8818e9e
Activity Expiration: Switch to 'expires_in' system.
2019-08-24 17:22:48 +02:00
654d291b6d
update tests
2019-08-24 17:41:53 +03:00
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
2019-08-24 15:48:33 +02:00
73bcbf4fa3
add tests
2019-08-24 11:03:13 +03:00
71700ea6d4
[ #1149 ] Updated docs & tests.
2019-08-24 09:27:32 +03:00
c29686309e
[ #1149 ] Upgraded `oban` from 0.6.0 to 0.7.1.
2019-08-23 09:23:10 +03:00
399ca9133b
fix test
2019-08-22 21:54:37 +03:00
f95b67c933
Merge branch 'develop' into issue/1177
2019-08-22 21:13:03 +03:00
7101ba1a21
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-22 21:01:28 +03:00
256ff09aa8
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
2019-08-22 20:59:58 +03:00
64bfb41c55
fixed unfollow for relay actor
2019-08-22 06:57:55 +03:00
85bd8a4e31
fixed clear config after test
2019-08-21 21:24:35 +03:00
76bb3572dd
test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1
2019-08-20 20:20:12 +00:00
74f7f308f8
Merge branch 'fix/admin-api-user-deletion' into 'develop'
...
Fix deactivated user deletion
See merge request pleroma/pleroma!1546
2019-08-20 19:34:47 +00:00
8340fe8fcc
Merge branch 'digest-template' into 'develop'
...
Improve digest email template
See merge request pleroma/pleroma!1565
2019-08-20 12:55:51 +00:00
ef43016b2c
Merge branch 'feature/custom-fields' into 'develop'
...
Add custom profile fields
See merge request pleroma/pleroma!1488
2019-08-20 12:44:14 +00:00
d2c9befc64
Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
...
# Conflicts:
# CHANGELOG.md
2019-08-19 17:00:59 +00:00
75a5dd41ee
Add more tests for Database tasks and DigestEmailWorker
2019-08-19 16:10:00 +00:00
a320358703
added test helpers to clear config after tests
2019-08-19 15:34:29 +00:00
49ae3191df
Merge branch 'hotfix/user_unfollow' into 'develop'
...
[#1177 ] fixed User.unfollow with synchronization external user
See merge request pleroma/pleroma!1579
2019-08-19 14:36:10 +00:00
e652cef76b
removes duplicates from relay subscription list
2019-08-19 13:39:18 +03:00
a2fdc32368
tests: activitypub: fix typo
2019-08-18 22:31:59 +00:00
475fcb3e6c
Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop'
...
Clear follow requests when blocking a user
See merge request pleroma/pleroma!1583
2019-08-18 21:59:22 +00:00
18c8c8d176
Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'
...
Hide muted theads from home/public timelines unless `with_muted` is set
See merge request pleroma/pleroma!1575
2019-08-18 21:57:55 +00:00
58c1391c4d
use commonAPI in tests
2019-08-18 22:54:40 +01:00
94e336d9d5
clear follow requests when blocking a user
2019-08-18 20:30:57 +01:00
3315a2a1c3
fixed User.unfollow with synchronization external user
2019-08-16 15:58:42 +03:00
7ab2dbbdb6
Merge branch 'pleroma-conversations' into 'develop'
...
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
2019-08-16 12:55:33 +00:00
6a3b1a526e
max_body_size -> max_body_length, as it should be
2019-08-15 15:34:41 -05:00
a4a3e3becd
Hide muted theads from home/public timelines unless `with_muted` is set
2019-08-15 17:37:30 +03:00
ec969eec51
Merge branch 'develop' into 'fix/admin-api-user-deletion'
...
# Conflicts:
# CHANGELOG.md
2019-08-14 22:45:32 +00:00
2b94ae3b39
Do not check if actor is active when deleting a user
2019-08-15 01:35:29 +03:00
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-14 21:44:50 +03:00
a180c1360e
[ #1149 ] Oban mailer job. Adjusted tests.
2019-08-14 21:42:21 +03:00
d81f63845a
Implement Pleroma.Stats as GenServer
2019-08-14 11:59:33 -04:00
51bdf0cab6
use default child_specs
2019-08-14 11:55:17 -04:00
d3af9e19ed
Conversations: Load relations in one query.
2019-08-14 17:01:11 +02:00
4b7f1c6995
Improve digest email template
2019-08-14 20:46:05 +07:00
560dbad538
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
2019-08-14 15:30:40 +02:00
e457fcc479
Add `:max_remote_account_fields` config option
2019-08-14 14:58:06 +07:00
f7bbf99caa
Use info.fields instead of source_data for remote users
2019-08-14 14:52:54 +07:00
2c35d4b0b0
Add configurable account field name length limit
2019-08-14 14:52:54 +07:00
db3c05f6b4
Add configurable account field value length limit
2019-08-14 14:52:54 +07:00
7d6f8a7fd7
Linkify custom fields values in ActivityPub.UserViewx
2019-08-14 14:52:54 +07:00
5178f960c3
Support user attachment update in Transmogrifier
2019-08-14 14:52:54 +07:00
88598c9baf
Add profile custom fields to ActivityPub.UserView
2019-08-14 14:52:54 +07:00
d6094b405d
Fix tests
2019-08-14 14:52:54 +07:00
e0ac5c7a66
Add custom profile fields
2019-08-14 14:52:54 +07:00
9ef31767f2
Merge branch 'feature/mrf-vocabulary' into 'develop'
...
MRF Vocabulary
See merge request pleroma/pleroma!1559
2019-08-13 22:51:15 +00:00
c3a54cc34d
Merge branch 'feature/mrf-describe' into 'develop'
...
MRF describe API
See merge request pleroma/pleroma!1561
2019-08-13 22:46:19 +00:00
83a3de8cc4
Merge branch 'length-limit-bio' into 'develop'
...
Add configurable length limits for `User.bio` and `User.name`
See merge request pleroma/pleroma!1515
2019-08-13 22:40:13 +00:00
4244e17de0
fix credo
2019-08-13 22:36:24 +00:00
10fef2fcee
tests: fix up nodeinfo tests
2019-08-13 22:32:40 +00:00
dd0b71ea6d
tests: add tests for MRF.describe()
2019-08-13 22:19:15 +00:00
7089400675
test: add mock MRF module for describe() testing
2019-08-13 21:29:15 +00:00
fea4d89e9f
tests for Web/ActivityPub/Relay
2019-08-13 21:12:59 +00:00
04da1166db
tests for /web/mastodon_api/mastodon_api.ex
2019-08-13 21:12:37 +00:00
f7e3b7ff75
tests: add tests for mrf_vocabulary
2019-08-13 20:55:42 +00:00
0e1c481a94
[ #1149 ] Added more oban workers. Refactoring.
2019-08-13 20:20:26 +03:00
511ccea5aa
ConversationView: Align parameter names with other views.
2019-08-12 14:23:06 +02:00
60231ec7bd
Conversation: Add endpoint to get a conversation by id.
2019-08-12 13:58:04 +02:00
23c46f7e72
Conversations: Use 'recipients' for accounts in conversation view.
...
According to gargron, this is the intended usage.
2019-08-12 12:51:08 +02:00
9cfc289594
MRF: ensure that subdomain_match calls are case-insensitive
2019-08-10 21:19:26 +00:00
84808e1697
Merge branch 'develop' into 'fix/hide-follows-counters'
...
# Conflicts:
# CHANGELOG.md
2019-08-10 18:49:04 +00:00
af4cf35e20
Strip internal fields including likes from incoming and outgoing activities
2019-08-10 18:47:40 +00:00
11d08c2de0
tests for Pleroma.Uploaders
2019-08-10 18:46:26 +00:00
33a5fc4a70
[ #1149 ] Fixed failing tests. Ensured Instance.set_unreachable/2 supports ISO 8601 datetime.
2019-08-10 20:38:31 +03:00
0802a08871
Mastodon API: Fix thread mute detection
...
It was calling CommonAPI.thread_muted? with post author's account
instead of viewer's one.
2019-08-10 16:27:46 +03:00
bb9c539580
Uploader.S3 added support stream uploads
2019-08-10 11:27:59 +00:00
dfae61c25c
Fix deactivated user deletion
2019-08-09 23:05:28 +03:00
267262491e
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-09 20:09:56 +03:00
b7fad8d395
[ #1149 ] Oban jobs implementation for :federator_incoming and :federator_outgoing queues.
2019-08-09 20:08:01 +03:00
409bcad54b
Mastodon API: Set follower/following counters to 0 when hiding
...
followers/following is enabled
We are already doing that in AP representation, so I think we should do
it here as well for consistency.
2019-08-09 16:53:55 +03:00
29807ef6a5
Merge branch 'feature/digest-email' into 'develop'
...
Feature/digest email
See merge request pleroma/pleroma!1078
2019-08-08 14:38:33 +00:00
a2b98f6d58
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
2019-08-08 16:04:20 +02:00
aa718ab8f6
Merge branch 'fix/object-reembeds' into 'develop'
...
Do not rembed the object after updating it
Closes #1142
See merge request pleroma/pleroma!1538
2019-08-06 22:14:00 +00:00
5329e84d62
OStatus tests: stop relying on embedded objects
2019-08-07 00:58:48 +03:00
32018a4ee0
ActivityPub tests: remove assertions of embedded object being updated,
...
because the objects are no longer supposed to be embedded
2019-08-07 00:36:13 +03:00
139b196bc0
[ #1150 ] fixed parser TwitterCard
2019-08-06 20:19:28 +00:00
a49c92f6ae
Participation: Setting recipients will always add the owner.
2019-08-06 14:51:17 +02:00
bdc9a7222c
tests for CommonApi/Utils
2019-08-05 15:37:05 +00:00
d6fe220e32
Linting.
2019-08-05 16:11:23 +02:00
b64b6fee2a
CommonAPI: Replies to conversations also get the correct context id.
2019-08-05 15:33:22 +02:00
3af6d14da7
Pleroma Conversations API: Add a way to set recipients.
2019-08-05 15:09:19 +02:00
96028cd585
Remove Reply-To from report emails
2019-08-04 22:24:50 +00:00
e8ad116c2a
Do not add the "next" key to likes.json if there is no more items
2019-08-04 17:13:06 +00:00
de0f3b73dd
Admin fixes
2019-08-03 18:16:09 +00:00
040347b248
Remove spaces from the domain search
2019-08-03 18:13:20 +00:00
8b2fa31fed
Handle MRF rejections of incoming AP activities
2019-08-03 18:12:38 +00:00
eee98aaa73
Pleroma API: Add endpoint to get conversation statuses.
2019-08-02 19:53:08 +02:00
d93d777915
Fix/mediaproxy whitelist base url
2019-08-02 17:07:09 +00:00
9d4f34fbcb
Merge branch 'develop' into feature/digest-email
2019-08-02 18:16:04 +03:00
56b1c3af13
CommonAPI: Extend api with conversation replies.
2019-08-02 15:05:27 +02:00
5ff8f07ca9
Merge branch 'feature/hide-follows-remote' into 'develop'
...
Refactor Follows/Followers counter syncronization and set hide_followers/hide_follows for remote users
See merge request pleroma/pleroma!1411
2019-08-02 11:23:07 +00:00
f88560accd
Conversations: Add recipient list to conversation participation.
...
This enables to address the same group of people every time.
2019-08-02 11:55:41 +02:00
23d279e03e
[ #1149 ] Replaced RetryQueue with oban-based retries.
2019-08-01 17:28:00 +03:00
f98235f2ad
Clean up tests output
2019-08-01 16:33:36 +07:00
9ca4506355
Add configurable length limits for `User.bio` and `User.name`
2019-08-01 15:53:37 +07:00
6c06529cd4
Merge branch 'fix/disallow-ostatus-follows-locked' into 'develop'
...
Disallow following locked accounts over OStatus
See merge request pleroma/pleroma!1512
2019-07-31 19:13:56 +00:00
813c686dd7
Disallow following locked accounts over OStatus
2019-07-31 22:05:12 +03:00
6eb33e7303
test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id
2019-07-31 18:35:15 +00:00
f72e0b7cad
ostatus: explicitly disallow protocol downgrade from activitypub
...
This closes embargoed bug #1135 .
2019-07-31 18:17:31 +00:00
301ea0dc04
Add tests for counters being updated on follow
2019-07-31 21:09:13 +03:00
58443d0cd6
tests for TwitterApi/UtilController
2019-07-31 15:14:36 +00:00
7483679a7b
StatusView: Return direct conversation id.
2019-07-31 15:12:29 +02:00
c88a5d3251
Merge branch 'develop' into feature/hide-follows-remote
2019-07-31 14:12:29 +03:00
51b3b6d816
Admin changes
2019-07-30 16:36:05 +00:00
5835069215
Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"
...
This reverts merge request !1504
2019-07-29 19:42:26 +00:00
5795a890e9
markdown: clean up html generated by earmark
2019-07-29 19:09:58 +00:00
1dfde4151c
Merge branch 'refactor/use-constants' into 'develop'
...
refactoring: begin to use constants
See merge request pleroma/pleroma!1500
2019-07-29 16:30:47 +00:00
c0e258cf21
Redirect not logged-in users to the MastoFE login page on private instances
2019-07-29 16:17:22 +00:00
159bbec570
added tests for OstatusController
2019-07-29 05:02:20 +00:00
b93498eb52
constants: add as_public constant and use it everywhere
2019-07-29 02:43:19 +00:00
492d854e7a
transmogrifier: use User.delete() instead of handrolled user deletion code for remote users
...
Closes #1104
2019-07-28 21:32:04 +00:00
242f5c585e
add account confirmation email resend in mastodon api
2019-07-28 20:30:10 +00:00
6a4b8b2681
fixed User.update_and_set_cache for stale user
2019-07-28 20:29:26 +00:00
6b77a88365
[ #1097 ] added redirect: /pleroma/admin -> /pleroma/admin/
2019-07-26 20:27:38 +00:00
41e0304757
Merge branch 'develop' into feature/hide-follows-remote
2019-07-25 18:43:30 +03:00
03c386614f
fixed test for elixir 1.7.4
2019-07-25 03:43:13 +00:00
19835be067
Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'
...
Fix remote follow from /ostatus_subscribe
Closes #1103
See merge request pleroma/pleroma!1472
2019-07-24 19:29:01 +00:00
b20020da16
Show the url advertised in the Activity in the Status JSON response
2019-07-24 19:28:21 +00:00
8d9f43e1d1
Add WebFinger test for AP-only account
2019-07-25 01:27:34 +09:00
84fca14c3c
Do not prepend /media/ when using base_url
...
This ensures admin has full control over the path where media resides.
2019-07-24 15:35:25 +00:00
0e2b5a3e6a
WIP
2019-07-24 17:25:11 +02:00
55341ac717
tests WebFinger
2019-07-24 15:13:10 +00:00
4504135894
Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)
2019-07-24 15:12:27 +00:00
2c83eb0b15
Revert "squash! Expose expires_at datetime in mastoAPI only for the activity actor"
...
This reverts commit 2981821db8
2019-07-24 17:09:59 +02:00
2981821db8
squash! Expose expires_at datetime in mastoAPI only for the activity actor
...
NOTE: rewrite the commit msg
2019-07-24 16:51:09 +02:00
d2da3d30f3
Merge branch 'develop' into feature/digest-email
2019-07-24 16:37:52 +03:00
3cb471ec06
Expose expires_at datetime in mastoAPI only for the activity actor
...
In the "pleroma" section of the MastoAPI for status activities you can
see an expires_at item that states when the activity will expire, or
nothing if the activity will not expire.
The expires_at date is only visible to the person who posted the
activity. This is the conservative approach in case some attacker
decides to write a logger for expiring posts. However, in the future of
OCAP, signed requests, and all that stuff, this attack might not be that
likely. Some other pleroma dev should remove the restriction in the code
at that time, if they're satisfied with the security implications of
doing so.
2019-07-24 14:47:22 +02:00
36012ef6c1
Require that ephemeral posts live for at least one hour
...
If we didn't put some kind of lifetime requirement on these, I guess you
could annoy people by sending large numbers of ephemeral posts that
provoke notifications but then disappear before anyone can read them.
2019-07-24 14:46:08 +02:00
704960b3c1
Add support for activity expiration to common and Masto API
...
The "expires_at" parameter accepts an ISO8601-formatted date which
defines when the activity will expire.
At this point the API will not give you any feedback about if your post
will expire or not.
2019-07-24 14:45:14 +02:00
378f5f0fbe
Add activity expiration worker
...
This is a worker that runs every minute and deletes expired activities.
It's based heavily on the scheduled activities worker.
2019-07-24 13:14:52 +02:00
666514194a
Add activity expirations table
...
Add a table to store activity expirations. An activity can have zero or
one expirations. The expiration has a scheduled_at field which stores
the time at which the activity should expire and be deleted.
2019-07-24 13:14:52 +02:00
8ba7a151ad
Cleanup: fix a comment
2019-07-24 13:14:52 +02:00
f5d574f4ed
check both item and parent domain blocks
2019-07-24 11:35:16 +01:00
4af4f6166b
honour domain blocks on streaming notifications
2019-07-24 11:09:06 +01:00
9c6357324e
Merge branch 'feature/admin-api-user-statuses' into 'develop'
...
Admin API: Endpoint for fetching latest user's statuses
See merge request pleroma/pleroma!1413
2019-07-23 23:59:21 +00:00
d3bdb8e704
rich media: parser: splice the given URL into the result
2019-07-23 23:51:29 +00:00
f46805bb40
Merge branch 'develop' into feature/admin-api-user-statuses
2019-07-24 02:42:28 +03:00
03471151d6
AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)
2019-07-24 01:51:36 +03:00
5e72554f3c
Admin config fix
2019-07-23 19:17:00 +00:00
c49a09ed88
tests for Pleroma.Web.ActivityPub.Publisher
2019-07-23 19:15:48 +00:00
8d3cf7e519
Merge branch 'bugfix/unauthed-liked-by' into 'develop'
...
Bugfix: don't error out on unauthorized request to liked/favourited_by
See merge request pleroma/pleroma!1474
2019-07-23 19:14:43 +00:00
03d89e182e
Merge branch 'fix/subscriber-notifications' into 'develop'
...
Do not notify subscribers for messages from users which are replies to others
See merge request pleroma/pleroma!1477
2019-07-23 19:13:55 +00:00
ec7b085b76
Fix test
2019-07-23 13:57:22 -05:00
fd287387a0
Do not notify subscribers for messages from users which are replies to others
2019-07-23 13:14:26 -05:00
e7c64f106e
signature: properly deduce the actor from misskey key IDs
2019-07-23 16:47:22 +00:00
c400565427
fix test names because i cannot type
2019-07-23 15:47:17 +01:00
299c0e965b
actually reblog on the reblog test
2019-07-23 15:38:19 +01:00
7026018c8c
Use correct URL for tests
2019-07-23 15:31:35 +01:00
452980652d
Mix format
2019-07-23 15:13:05 +01:00
fd1fa5a2ec
add tests for unauthed reqs to liked/reblogged_by
2019-07-23 15:08:41 +01:00
14ab2fd0f4
remove pry
2019-07-23 12:30:37 +03:00
9340896c9e
Exclude tests that use :crypt.crypt/2 on macOS
2019-07-22 19:54:22 +00:00
b70e659304
Feature/1087 wildcard option for blocks
2019-07-22 14:33:58 +00:00
674ad5e1df
Merge branch 'hardening/stop-misusing-sharedinbox' into 'develop'
...
activitypub: publisher: align sharedinbox usage with AP specification rules
See merge request pleroma/pleroma!1464
2019-07-22 11:01:35 +00:00
f712ee879a
Bugfix: muted/blocked user notification streaming
2019-07-22 02:43:55 +00:00
05b5af8075
Add tests for users tasks and PleromaAuthenticator
2019-07-22 02:43:15 +00:00
a5d6287ba8
Hide blocked users from interactions
2019-07-22 02:42:29 +00:00
56019d53a8
activitypub: publisher: align sharedinbox usage with AP specification rules
...
While debugging the follow breakage, I observed that our sharedInbox usage
did not match the rules in the specification. Accordingly, I have better
aligned our usage of sharedInbox with the rules outlined in the ActivityPub
specification.
2019-07-22 02:38:31 +00:00
196cad46f3
Resolve merge conflicts
2019-07-20 22:04:47 +03:00
8292331b35
Merge branch 'develop' into feature/digest-email
2019-07-20 16:41:58 +03:00
43a7cd27fe
[tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest
2019-07-20 13:07:51 +00:00
36049f08ef
Merge develop
2019-07-20 01:03:25 +03:00
33729bbb28
Merge branch 'feature/richmedia-ttl' into 'develop'
...
add the rich media ttl based on image exp time
See merge request pleroma/pleroma!1438
2019-07-19 21:36:36 +00:00
716afc83ce
Merge branch 'refactor/http-signature-plug' into 'develop'
...
http signature plug: separation of concerns
See merge request pleroma/pleroma!1449
2019-07-19 16:57:24 +00:00
c2e2aadc42
#1110 fixed /api/pleroma/healthcheck
2019-07-19 16:20:23 +00:00
de9906ad56
change the structure of image ttl parsar
2019-07-19 11:43:42 +05:45
9570a5be40
Merge branch 'develop' into feature/admin-api-user-statuses
2019-07-18 23:38:38 +03:00
c947cfec5a
mapped signature plug: use `user` assign like authentication plug
2019-07-18 20:31:25 +00:00
f435217e50
tests for Plugs.AuthenticationPlug
2019-07-18 20:29:51 +00:00
621cacf667
tests: add tests for mapped signature plug
2019-07-18 16:28:36 +00:00
88d064d80e
http signature plug: remove redundant checks handled by HTTPSignatures library
...
the redundant checks assumed a POST request, which will not work for signed GETs.
this check was originally needed because the HTTPSignatures adapter assumed that
the requests were also POST requests. but now, the adapter has been corrected.
2019-07-18 15:11:21 +00:00
f9a0014681
Merge branch 'feature/signed-object-fetches' into 'develop'
...
signed object fetches
See merge request pleroma/pleroma!1446
2019-07-18 13:27:50 +00:00
b6b748d3e7
tests for Uploader with webhook
2019-07-18 12:30:18 +00:00
1345e0c2bf
tests: add tests for signed object fetches
2019-07-17 23:06:16 +00:00
1e48af9acf
Merge branch 'feature/instance-fetch-actor' into 'develop'
...
instance fetch service actor
See merge request pleroma/pleroma!1440
2019-07-17 19:45:40 +00:00
60b54ee64a
Merge branch 'feature/http-signatures-keyid' into 'develop'
...
http signatures: derive actor from key IDs
See merge request pleroma/pleroma!1442
2019-07-17 19:44:14 +00:00
f84fb340b7
http signatures: derive actor ID from key ID.
...
Almost all AP servers return their key ID as the actor URI with #main-key
added. Hubzilla, which doesn't, uses a URL which refers to the actor
anyway, so worst case, Hubzilla users get refetched.
2019-07-17 19:18:19 +00:00
4bf2bb9cff
Fix password reset for non-test env
...
Fixes `Plug.Conn.NotSentError` that causes a 5xx error in response
instead of 404 and 400.
Fixes pattern matching error caused by different response format
in test and non-test env: `Pleroma.Emails.Mailer.deliver_async` returns
:ok when PleromaJobQueue is enabled and `{:ok, _}` when it's disabled.
In tests, it's disabled.
2019-07-17 18:09:31 +00:00
3d23a12d75
tests: add test for fetching the internal fetch actor
2019-07-17 17:48:08 +00:00
62e5ff624e
user: add is_internal_user? helper function
2019-07-17 17:12:42 +00:00
ce73d5f6a5
Merge branch 'feature/mention-mrf' into 'develop'
...
Add MRF MentionPolicy for dropping posts which mention specific actors
See merge request pleroma/pleroma!1439
2019-07-17 15:28:41 +00:00
96a2890a9e
Add MRF MentionPolicy for dropping posts which mention specific actors
2019-07-17 15:16:55 +01:00
10f82c88b8
mastoapi password reset
...
added rate limit to password reset
configure rate limit in runtime
2019-07-16 21:44:50 +00:00
21e3f9ac69
added tests for Pleroma.Upload.Filter
2019-07-16 21:35:43 +00:00
18234cc44e
add the rich media ttl based on image exp time
2019-07-17 00:20:34 +05:45
9bca70b10a
Merge develop
2019-07-16 16:19:19 +03:00
520ee6c591
Add `pleroma.deactivated` to the Account entity (Mastodon API)
2019-07-16 11:14:46 +00:00
c4ca142e14
Add the `blocked_by` attribute to the relationship API (`GET /api/v1/accounts/relationships`)
2019-07-16 11:04:11 +00:00
996fd58ac4
Merge branch 'bugfix/poll-id-as-string' into 'develop'
...
Status View: Poll ids are strings.
See merge request pleroma/pleroma!1430
2019-07-16 06:06:22 +00:00
7a24def473
Mastodon Controller: Fix tests.
2019-07-16 14:01:18 +09:00
1ed24bcc76
Status View: Poll ids are strings.
...
All ids in mastodon are strings, in general.
2019-07-16 12:47:40 +09:00
9f987dd017
Merge branch 'match-file-name' into 'develop'
...
try to always match the filename for proxy url
See merge request pleroma/pleroma!1405
2019-07-15 22:04:58 +00:00
b74300bc7a
Add more tests for MastodonAPIController and CommonAPI
2019-07-15 19:47:23 +00:00
1d906ffa82
Merge branch 'develop' into match-file-name
...
# Conflicts:
# lib/pleroma/web/media_proxy/media_proxy_controller.ex
2019-07-15 21:30:56 +05:45
03c4ea44ad
Merge branch 'admin-configure-atom-keys' into 'develop'
...
admin configure - atom keys with leading :
See merge request pleroma/pleroma!1424
2019-07-15 13:01:58 +00:00
c32384c1ea
tests for Pleroma.Signature
2019-07-15 13:01:22 +00:00
b8607c151c
migrating task refactor
2019-07-15 15:45:27 +03:00
c66044b923
atom keys with leading :
2019-07-15 11:00:55 +03:00
de13c9bb8f
List messages must be visible for mentioned users
2019-07-15 14:54:40 +07:00
64a946643e
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-07-15 14:11:54 +07:00
a87c313309
Support `list` visibility in StatusView
2019-07-15 14:00:29 +07:00
fa17879c20
added tests for Web.MediaProxy
2019-07-14 21:01:32 +00:00
dce8ebc9ea
Unfollow should also unsubscribe
2019-07-14 19:25:03 +00:00
841314c2d5
tests: fix object containment violations in the transmogrifier tests
...
Some objects were not completely rewritten in the tests, which caused object
containment violations. Fix them by rewriting the object IDs to be in an
appropriate namespace.
2019-07-14 19:24:22 +00:00
c729883936
Merge branch 'develop' into feature/digest-email
2019-07-14 21:43:30 +03:00
739bbe0d3b
security: detect object containment violations at the IR level
...
It is more efficient to check for object containment violations at the IR
level instead of in the protocol handlers. OStatus containment is especially
a tricky situation, as the containment rules don't match those of IR and
ActivityPub.
Accordingly, we just always do a final containment check at the IR level
before the object is added to the IR object graph.
2019-07-14 17:47:08 +00:00
cef4337f95
Merge branch 'bugfix/llal-object-containment' into 'develop'
...
Object.Fetcher: Handle error on Containment.contain_origin/2
See merge request pleroma/pleroma!1414
2019-07-14 16:39:17 +00:00
a2c601acb5
FetcherTest: Containment refute called(OStatus.fetch_activity_from_url)
2019-07-14 17:05:32 +02:00
e7c39b7ac8
Feature/1072 muting notifications
2019-07-14 13:29:31 +00:00
f00562ed6b
HttpRequestMock: Add 404s on OStatus fetching for info.pleroma.site
2019-07-14 13:55:41 +02:00
efa9a13d4e
HttpRequestMock: Add missing mocks for object containment tests
2019-07-14 13:55:41 +02:00
0c2dcb4c69
Add follow information refetching after following/unfollowing
2019-07-14 01:58:39 +03:00
183da33e00
Add tests for fetch_follow_information_for_user and check object type
...
when fetching the page
2019-07-14 00:56:02 +03:00
418ae6638d
Merge branch 'develop' into feature/admin-api-user-statuses
2019-07-14 00:39:06 +03:00
a9459ff98f
Admin API: Endpoint for fetching latest user's statuses
2019-07-14 00:37:26 +03:00
80c46d6d8b
nodeinfo: implement MRF transparency exclusions
2019-07-13 18:53:14 +00:00
e8fa477793
Refactor Follows/Followers counter syncronization
...
- Actually sync counters in the database instead of info cache (which got
overriden after user update was finished anyway)
- Add following count field to user info
- Set hide_followers/hide_follows for remote users based on http status
codes for the first collection page
2019-07-13 19:27:49 +03:00
369e9bb42f
[ #1041 ] Rate-limited status actions (per user and per user+status).
2019-07-13 14:49:39 +03:00
095117a58c
Merge branch 'develop' into fix/ap-hide-follows
2019-07-12 21:43:06 +03:00
97b79efbcd
ActivityPub Controller: Actually pass for_user to following/followers
...
views and give 403 errors when trying to request hidden follower pages
when unauthenticated
2019-07-12 20:54:20 +03:00
f8e3ae6154
try to always match the filename for proxy url
2019-07-12 22:56:14 +05:45
92055941bd
Pleroma.Web.Metadata - tests
2019-07-12 16:42:54 +00:00
1f6ac7680d
ActivityPub User view: Following/Followers refactoring
...
- Render the collection items if the user requesting == the user
rendered
- Do not render the first page if hide_{followers,follows} is set, just
give the URI to it
2019-07-12 19:41:55 +03:00
360e4cdaa2
Move these to pleroma namespace in Mastodon API
2019-07-12 11:25:58 -05:00
27ed260eed
AP user view: Add a test for hiding totalItems in following/followers
2019-07-12 18:36:14 +03:00
6a6c4d134b
preserve the original path/filename (no encoding/decoding) for proxy
2019-07-12 21:05:01 +05:45
eae991b06a
merge develop
2019-07-12 18:08:27 +03:00
4198c3ac39
Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel
2019-07-11 13:55:31 +00:00
846ad9a463
admin api configure changes
2019-07-11 13:02:13 +00:00
e4e3fd7e55
Merge branch 'fix/1019-refactor' into 'develop'
...
Fix/1019 refactor
See merge request pleroma/pleroma!1397
2019-07-11 13:01:11 +00:00
9e06873d58
Add `list` to Visibility
2019-07-11 19:29:24 +07:00
958fb9aa80
Add "listMessage"
2019-07-11 16:36:08 +07:00
182f7bbb11
Merge branch 'develop' into feature/addressable-lists
2019-07-11 13:26:59 +07:00
a237c6a2d4
support for idna domains
2019-07-10 15:23:25 +00:00
252e129b1e
MastoAPI: Add categories to custom emojis
...
Note: This isn’t in a release yet, can be seen in mastofe on the
rebase/glitch-soc branch.
2019-07-10 17:02:37 +02:00
beba7bbc85
removing synchronization worker
2019-07-10 17:42:18 +03:00
ade213cb35
robots txt test fix
2019-07-10 17:42:18 +03:00
f8786fa6f2
adding following_address field to user
2019-07-10 17:42:18 +03:00
ff55e3c16f
Create mentions only for explicitly mentioned users
2019-07-10 13:29:50 +00:00
c2a589d9a3
Fix credo warning
2019-07-10 18:10:09 +07:00
0d54a571ca
Add SetLocalePlug
2019-07-10 18:08:03 +07:00
008c55e4e9
add test for search_controller/ 100% coverage
2019-07-10 08:28:03 +00:00
12b1454245
[ #1062 ] added option to disable send email
2019-07-10 05:34:21 +00:00
2d2b50ccca
Send and handle "Delete" activity for deleted users
2019-07-10 05:16:08 +00:00
75be90a6d1
Merge branch 'release/listener' into 'develop'
...
add listener port and ip option for 'pleroma.instance gen' and enable its test
See merge request pleroma/pleroma!1393
2019-07-10 05:14:08 +00:00
93a0eeab16
Add license/copyright to all project files
2019-07-10 05:13:23 +00:00
bb8065a1fd
tests MRF filters
2019-07-10 05:12:21 +00:00
6d0ae264fc
add listener port and ip option for 'pleroma.instance gen' and enable its test
2019-07-10 01:46:49 +05:45
8a41d34673
[ #878 ] Tests improvements per code review.
2019-07-09 22:37:59 +03:00
6fc0c27be3
[ #878 ] Uncommented test statement.
2019-07-09 22:28:04 +03:00
829e997223
[ #878 ] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests
...
# Conflicts:
# lib/pleroma/object.ex
# test/web/activity_pub/transmogrifier_test.exs
# test/web/ostatus/ostatus_test.exs
2019-07-09 21:46:16 +03:00
371d39e160
Merge develop
2019-07-09 21:21:09 +03:00
1417627d07
Merge branch 'remove-avatar-header' into 'develop'
...
Ability to reset avatar, profile banner and backgroud
See merge request pleroma/pleroma!1187
2019-07-09 17:51:41 +00:00
d6b0fce6e9
Fix/1019 correct count remote users
2019-07-09 17:36:35 +00:00
4948117fcf
Merge branch 'remove-swift' into 'develop'
...
Remove Uploaders.Swift and `httpoison` dependency
Closes #1051
See merge request pleroma/pleroma!1374
2019-07-09 16:54:32 +00:00
4e6e5d8042
reverse proxy tests
2019-07-09 16:54:13 +00:00
1179a13533
Merge branch 'features/sec-websocket-protocol-header' into 'develop'
...
Features: MastoAPI streaming Sec-WebSocket-Protocol header
See merge request pleroma/pleroma!1381
2019-07-09 16:52:22 +00:00
167f810ff1
Merge branch 'proxy-error' into 'develop'
...
make sure the url used by proxy is same as original url
See merge request pleroma/pleroma!1383
2019-07-09 16:00:44 +00:00
e143747445
Add test for URLs with Unicode characters too
2019-07-09 10:55:36 -05:00
95c085174d
Merge branch 'test-speedup' into 'develop'
...
Testing: Don't federate in testing.
See merge request pleroma/pleroma!1391
2019-07-09 15:35:28 +00:00
ce3ffad13a
Remove duplicated test. New one is more comprehensive.
2019-07-09 10:23:22 -05:00
31a59d6f23
Merge branch 'develop' into proxy-error
2019-07-09 10:18:30 -05:00
98f13eac9e
Capitalize
2019-07-09 10:11:42 -05:00
4213a4e2aa
Test that all ASCII encoded characters are preserved
2019-07-09 09:43:33 -05:00
376a55c97f
Merge branch '161-incoming-replies-depth-limit' into 'develop'
...
[#161 ] Limited replies depth on incoming federation (memory leaks fix)
Closes #161
See merge request pleroma/pleroma!1361
2019-07-09 14:15:10 +00:00
23d4781e73
change for local user search
2019-07-09 08:52:49 +00:00
abe2e8881f
Testing: Don't federate in testing.
2019-07-09 15:30:51 +09:00
46cf81a544
[ #878 ] Formatting fix.
2019-07-08 20:05:02 +03:00
daff85a985
[ #878 ] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.
2019-07-08 19:53:02 +03:00
72b88c82bc
Mastodon API: Fix embedded relationships not being rendered inside of statuses
2019-07-08 12:07:08 +03:00
f5ad430974
make sure the url used by proxy is same as origin url
...
encoding or decoding it breaks some of the signed url
2019-07-07 14:13:40 +05:45
b5ba41a725
mastodon_websocket_test.exs: Test for Sec-WebSocket-Protocol header
2019-07-07 08:58:24 +02:00
ad8d86e7c6
Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
2019-07-06 10:17:06 +03:00
6dadf5d6f4
[ #1043 ] fix search accounts.
2019-07-05 04:22:08 +00:00
11143c542a
Remove `httpoison` from dependencies
2019-07-03 14:42:24 +07:00
ab50c6b3ca
Add fallback value to the admin report view.
...
This is to avoid 500 error when the reported user no longer exists
in the database.
2019-07-02 01:27:00 +00:00
d2cb18b2a3
Merge branch 'develop' into feature/digest-email
2019-06-30 21:23:35 +03:00
a799418573
[ #161 ] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
...
# Conflicts:
# CHANGELOG.md
2019-06-30 16:05:00 +03:00
2b9d914089
[ #161 ] Refactoring, documentation.
2019-06-30 15:58:50 +03:00
1f76740e10
Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)
2019-06-30 09:08:46 +00:00
acd20f166b
[ #1026 ] Filter.AnonymizeFilename added ability to retain file extension with custom text
2019-06-30 07:28:35 +00:00
4c60a562a7
Fix not being able to pin unlisted posts
...
Closes #1038
2019-06-29 22:27:42 +03:00
5b7b1040b3
[ #161 ] Limited replies depth on incoming federation in order to prevent memory leaks on recursive replies fetching.
2019-06-29 20:04:50 +03:00
d1549a6375
Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop'
...
Merge admin and mastodon user views for reports
See merge request pleroma/pleroma!1346
2019-06-29 00:12:09 +00:00
c22f0bfb80
test: add tests for mediaproxy warming policy
2019-06-28 23:41:42 +00:00
657277ffc0
Resolve conflicts
2019-06-29 00:52:50 +03:00
90927e6a9a
Kowalski, analysis!
2019-06-28 15:27:18 +03:00
452ca5250d
Merge admin and mastodon user views for reports
2019-06-28 15:15:32 +03:00
0369a5db16
Merge branch 'idempotency-plug' into 'develop'
...
Add IdempotencyPlug and use it in all of the api
Closes #1003
See merge request pleroma/pleroma!1339
2019-06-27 04:20:17 +00:00
c6705144a2
don't delete config settings on admin update
2019-06-27 04:19:44 +00:00
889a9c3a3f
Polish IdempotencyPlug
2019-06-27 01:53:58 +07:00
825077a5b0
Add Idempotency plug
2019-06-26 18:36:58 +07:00
d53fb55bb7
Return correct response when reply to a direct message is not direct itself
2019-06-26 10:59:27 +00:00
4ad15ad2a9
add ignore hosts and TLDs for rich_media
2019-06-25 22:25:37 +03:00
0cb8e710fb
add test
2019-06-25 18:06:08 +03:00
a0c4ebb4d7
[ #184 ] small refactoring reset password
2019-06-24 19:01:56 +00:00
2c63c67512
Rework user deletion
2019-06-24 18:59:12 +00:00
f2c03425b0
Broadcast conversation update when DM is deleted
2019-06-24 07:14:04 +00:00
27b9605de0
Merge branch 'rich_media_titles_two' into 'develop'
...
Rich media titles two
See merge request pleroma/pleroma!1325
2019-06-23 05:43:11 +00:00
b37ede5df3
log capturing
2019-06-23 08:16:28 +03:00
982cad0268
support for config groups
2019-06-23 08:16:16 +03:00
a0c65bbd6c
Merge branch 'develop' into 'remove-avatar-header'
...
# Conflicts:
# CHANGELOG.md
2019-06-23 03:25:50 +00:00
410add1c30
support for tuples with more than 2 values
2019-06-22 17:30:53 +03:00
0e415921cd
Rich Media Parser: Do not return just a title if nothing else is there.
2019-06-22 16:22:59 +02:00
58c4d5312b
Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'""
...
This reverts commit b6af80f769
2019-06-22 15:12:57 +02:00
f0fccb7578
fix for int and modules
2019-06-22 09:01:30 +03:00
55742d978d
Merge branch 'feature/mrf-anti-link-spam' into 'develop'
...
implement anti link spam MRF
See merge request pleroma/pleroma!1307
2019-06-21 22:56:54 +00:00
e3534f5b3c
Merge branch 'oauth_secure_redirect' into 'develop'
...
OAuth security improvements (`redirect_uri` listing enforcement)
See merge request pleroma/pleroma!1302
2019-06-21 22:31:12 +00:00
720412bf24
Merge branch 'revert-6f5a0cc1' into 'develop'
...
Revert "Merge branch 'fix/ogp-title' into 'develop'"
See merge request pleroma/pleroma!1317
2019-06-21 22:28:46 +00:00
b6af80f769
Revert "Merge branch 'fix/ogp-title' into 'develop'"
...
This reverts merge request !1277
2019-06-21 11:36:32 +00:00
fc6e661672
Fix rate limiter tests
2019-06-21 16:47:16 +07:00
32320c1ee9
Fixes for dynamic configuration
2019-06-20 17:43:57 +00:00
21dacd4b15
unbreak polls
2019-06-19 16:33:49 +00:00
736d8ad6be
implement anti link spam MRF
2019-06-19 15:58:32 +00:00
e4fa6b99ac
aliases for mix tasks
...
ecto.migrate
ecto.rollback
2019-06-19 10:33:33 +00:00
5c6c4ce634
Merge branch 'fix/rich-media-hashtags-again' into 'develop'
...
Rich Media: Skip Microformats hashtags
See merge request pleroma/pleroma!1304
2019-06-19 08:48:41 +00:00
035368d363
Rich Media: Skip Microformats hashtags
...
When fixing this problem I incorrectly assumed a.hashtag is
the proper way for detecting hashtags, but it is just something Pleroma and
Mastodon add. Per microformats it should be detected by the presense of rel=tag.
This MR adds a check for rel=tag, but I still left a.hashtag just in case
2019-06-19 00:46:30 +03:00
9f45f93949
Added more `redirect_uri` checks to prevent redirect to not explicitly listed URI.
2019-06-18 17:00:49 +03:00
c7acca2abb
Mastodon API: Sanitize display names
...
Closes #1000
2019-06-18 14:12:11 +03:00
49a49d3763
Merge branch 'removing-test-errors' into 'develop'
...
Removing test errors
See merge request pleroma/pleroma!1296
2019-06-17 14:16:23 +00:00
c34327b22e
Merge branch 'fix/sanitize-report-content' into 'develop'
...
Sanitize HTML in ReportView
Closes #990
See merge request pleroma/pleroma!1293
2019-06-16 18:05:00 +00:00
2e2edcb461
capturing errors
2019-06-16 20:10:12 +08:00
0f59265a50
salmon fix
...
removed some ownership sandbox error
2019-06-16 20:10:12 +08:00
a04bf131e0
[ #570 ] add user:notification stream
2019-06-16 10:33:25 +00:00
bf6aa6f1a8
Fix report content stopping to be nullable
2019-06-16 13:06:12 +03:00
44de34d170
Credo fixes
2019-06-16 01:35:45 +03:00
e943905bd7
Add tests for report view
2019-06-16 01:30:14 +03:00
52b1b0e45d
Merge branch '963_oob_oauth_redirect_fix' into 'develop'
...
[#963 ] No redirect on OOB OAuth authorize request with existing authorization
See merge request pleroma/pleroma!1276
2019-06-15 13:45:50 +00:00
a440cf856d
Mastodon API: Return the token needed for the chat.
2019-06-15 10:59:35 +02:00
62ffc00a5d
Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'
...
AccountView: Add user background.
See merge request pleroma/pleroma!1280
2019-06-14 16:49:28 +00:00
c2ca1f22a2
it is changed in compile time
...
we can't change module attributes and endpoint settings in runtime
2019-06-14 15:45:05 +00:00
7f48b90bfb
Merge branch 'fix/hashtag-rich-media' into 'develop'
...
Fix hashtags being picked up by rich media parser
Closes #989
See merge request pleroma/pleroma!1288
2019-06-14 11:52:04 +00:00
ee4ed87fb4
[ #948 ] /api/v1/account_search added optional parameters (limit, offset, following)
2019-06-14 11:39:57 +00:00
d0ebc0edf3
Fix hashtags being picked up by rich media parser
...
Closes #989
2019-06-14 14:34:42 +03:00
eac298083f
MastodonAPI: Add a way to update the background image.
2019-06-14 11:19:22 +02:00
5965efb216
AccountView: Add user background.
2019-06-13 19:08:05 +02:00
6f5a0cc14e
Merge branch 'fix/ogp-title' into 'develop'
...
Rich Media Parser: Attempt to use <title> from HTML as a fallback
Closes #979
See merge request pleroma/pleroma!1277
2019-06-13 13:26:39 +00:00
30e54fd7e2
Handle HTTP 404 response
2019-06-13 17:13:35 +07:00
afae3ada22
Handle HTTP "410 Gone" response
2019-06-13 16:34:03 +07:00
a12f8e13c8
Improve <title> fallback; Add a test
2019-06-13 15:02:46 +07:00
4b2c29016c
[ #963 ] No redirect on OOB OAuth authorize request with existing authorization. OAuth-related refactoring.
2019-06-12 21:30:06 +03:00
6f29865d43
Add option to restrict all users to local content
2019-06-11 21:25:53 +07:00
63ab3c30eb
Merge branch 'feature/rate-limiter' into 'develop'
...
Feature/Rate Limiter
Closes #943
See merge request pleroma/pleroma!1266
2019-06-11 11:32:01 +00:00
ad04d12de6
Replace `MastodonAPIController.account_register/2` rate limiter
2019-06-11 16:06:03 +07:00
2e5affce61
Add RateLimiter
2019-06-11 14:27:41 +07:00
f2d72b1fe4
Merge branch 'preload-changes' into 'develop'
...
Conversations: Fetch users in one query.
See merge request pleroma/pleroma!1258
2019-06-11 02:37:08 +00:00
365268d522
Add more tests for using media_proxy and whitelists
2019-06-10 11:34:11 +00:00
dffc9f060a
replace missing mock with a 404
2019-06-07 20:48:25 +03:00
d020f68e87
Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched
2019-06-07 20:40:38 +03:00
970f71e222
Conversations: Fetch users in one query.
2019-06-07 17:51:47 +02:00
01fe5abad1
Resolve conflicts
2019-06-07 01:20:50 +03:00
cb2bcee842
User Search: Boost friends more strongly.
2019-06-06 16:18:27 +02:00
7e9f7ea0c2
MastodonAPI: Add test for user search.
2019-06-06 16:16:22 +02:00
f82382de22
[ #943 ] Make the unauthenticated users limitation optional
2019-06-06 12:17:49 +00:00
3f6da9c45a
Merge branch 'bugfix/377-stuck-follow-request' into 'develop'
...
Bugfix/377 stuck follow request
Closes #377
See merge request pleroma/pleroma!1250
2019-06-05 15:52:40 +00:00
a511d2f900
Merge branch 'improve-search' into 'develop'
...
[#943 ] Contain search for unauthenticated users
See merge request pleroma/pleroma!1220
2019-06-05 15:51:32 +00:00
ad19bfc7fe
Utils: Split update_follow_state and update_follow_state_for_all.
2019-06-05 16:43:35 +02:00
827a51e777
CommonAPI: Add test for accept_follow_request.
2019-06-05 15:45:16 +02:00
076c9ae40e
User: Remove superfluous `maybe_follow`.
2019-06-05 14:24:31 +02:00
3115b64cfe
Transmogrifier: Add tests for incoming follows to locked accounts.
2019-06-05 14:10:46 +02:00
cfa5572d28
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-05 17:53:15 +07:00
024dfdc39c
Typo + Linting.
2019-06-05 12:45:28 +02:00
8b9a0dd4a7
User: Don't error out when following a user that's already followed.
...
This leads to a few situations where it is impossible to follow a user.
2019-06-05 12:06:45 +02:00
5b04f07a1e
Limit search for unauthenticated users to local users only
2019-06-05 16:51:04 +07:00
17a6f81f7b
Fix tests with enabled RUM
2019-06-05 16:37:43 +07:00
93397fce3d
Contain search for unauthenticated users
2019-06-05 16:37:43 +07:00
e4babb1c9f
Merge branch 'explicit-addressing' into 'develop'
...
Explicit addressing
See merge request pleroma/pleroma!1239
2019-06-05 08:28:20 +00:00
6ba9055b51
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-05 12:54:30 +07:00
b1b1a270e8
Fix conflict
2019-06-05 02:45:21 +03:00
ab4915edcb
Merge branch 'bugfix/956-activity-id-nil-conversations' into 'develop'
...
Participations: Filter out participations without activities.
Closes #956 and #953
See merge request pleroma/pleroma!1246
2019-06-04 15:34:55 +00:00
d3d1704e84
Merge branch 'develop' into issue/941
2019-06-04 15:06:58 +03:00
a3a7178b60
Participations: Filter out participations without activities.
2019-06-04 13:58:36 +02:00
bbff7554de
Add tests for get_existing_votes
2019-06-04 13:47:53 +03:00
9ce928d823
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-04 16:28:23 +07:00
4cab98b7bf
Merge remote-tracking branch 'origin/develop' into explicit-addressing
2019-06-04 11:23:46 +02:00
4f2e359687
Merge branch 'develop' into issue/941
2019-06-04 09:49:08 +03:00
9f0d0d0805
Merge branch 'feature/mrf-subchain' into 'develop'
...
MRF: subchain policy
See merge request pleroma/pleroma!1233
2019-06-04 05:49:54 +00:00
84cc131b59
Add missing HTTP Request mocks
2019-06-04 05:46:19 +00:00
9d2563a3de
Merge branch 'generic-fe-settings' into 'develop'
...
Generic settings store for frontend user settings
See merge request pleroma/pleroma!1221
2019-06-04 05:43:43 +00:00
f6036ce3b9
Fix tests
2019-06-04 03:38:53 +03:00
bd325132ca
Fix tests
2019-06-04 03:07:49 +03:00
3e17610587
Add task to test emails
2019-06-04 02:48:21 +03:00
6ef145b4fc
Merge branch 'develop' into feature/digest-email
2019-06-03 15:29:53 -05:00
64ada7f960
fix tests
2019-06-03 22:51:14 +03:00
f13d6c7f78
update api to set skip_thread_containment
2019-06-03 21:02:57 +03:00
804b6a4d8f
CommonAPI.Utils: Add tests.
2019-06-03 19:08:38 +02:00
80d4d83aac
CommonAPI: Add explicit addressing.
2019-06-03 18:17:08 +02:00
2b664b048e
User: Add function to get AP ids from nicknames.
2019-06-03 18:16:11 +02:00
080e1aa70e
add option skip_thread_containment
2019-06-03 16:13:37 +03:00
dc91bcc0af
Merge branch 'develop' into feature/polls-2-electric-boogalo
2019-06-03 13:16:17 +03:00
314758c25b
Merge branch 'align-mastodon-conversations' into 'develop'
...
Mastodon Conversations API: Align to Mastodon behavior
See merge request pleroma/pleroma!1215
2019-06-03 09:48:37 +00:00
026b245dbc
Merge branch 'develop' into feature/polls-2-electric-boogalo
2019-06-03 11:14:52 +03:00
2fe3a20638
Make error message about author's inability to vote more sensible
2019-06-02 23:33:15 +03:00
c47da0e65d
Add tests for poll view
2019-06-02 23:25:33 +03:00
38a275b31f
test: add tests for subchain policy
2019-06-02 10:08:51 +00:00
5402d04e3c
Merge branch 'feature/notification-control-part-2' into 'develop'
...
notification controls, part 2
See merge request pleroma/pleroma!1204
2019-06-02 08:25:37 +00:00
e394fc2eef
fix the flaky test for users creation by admin
2019-06-02 09:49:59 +05:45
cfa588e357
Fix Credo issues
2019-06-01 21:42:29 +03:00
65db5e9f52
Resolve merge conflicts
2019-06-01 16:29:58 +03:00
300d94c628
Add poll votes
...
Also in this commit by accident:
- Fix query ordering causing exclude_poll_votes to not work
- Do not create notifications for Answer objects
2019-06-01 16:17:46 +03:00
ad5263c647
Merge remote-tracking branch 'upstream/develop' into admin-create-users
2019-06-01 11:42:37 +05:45
5534d4c676
make bulk user creation from admin works as a transaction
2019-06-01 11:17:53 +05:45
e706b42f51
Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop'
...
visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility
See merge request pleroma/pleroma!1230
2019-06-01 03:39:13 +00:00
2bbc2a801f
Remove all follower collections but actor's from "cc"
2019-06-01 03:26:45 +00:00
d46cc7896e
Merge branch 'bugfix/remove-vanilla-flavour' into 'develop'
...
Bugfix: remove vanilla flavour
See merge request pleroma/pleroma!1228
2019-06-01 03:26:05 +00:00
f2efe24cf8
visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility
2019-06-01 03:24:08 +00:00
d4304a3945
add the missing mock file
2019-06-01 08:37:10 +05:45
5d3ece2861
Remove now useless flavours switching
2019-06-01 01:44:10 +02:00
2993361075
Merge branch 'hotfix/leaking-lists' into 'develop'
...
Mastodon API: Fix lists leaking private posts
See merge request pleroma/pleroma!1222
2019-05-31 13:26:48 +00:00
7861974ab2
MastodonAPI: Add extension to set and get pleroma_settings_store.
2019-05-31 14:50:18 +02:00
aaad85c4d9
AccountView: settings -> settings_store
2019-05-31 14:49:46 +02:00
eb2963bc43
User: Add settings store to Info, AccountView
...
This is to provide a generic frontend settings storage mechanism for all kinds
of frontends.
2019-05-31 14:27:15 +02:00
d9c0650ff9
Mastodon API: Fix lists leaking private posts
...
Our previous list visibility resolver grabbed posts if either follower
collection of the user in a list who is followed is in `to` or if
follower collection of the user in a list was in `cc`. This not only
missed unlisted posts but also lead to leaking private posts when
`fix_explicit_addressing` mistakingly started putting follower collections
to `cc` (also fixed in this MR).
Reported by @kurisu@iscute.moe via a DM
2019-05-31 15:25:17 +03:00
a9eaa55885
Fix fix_explicit_addressing moving follower collection to cc and add tests for it
2019-05-31 14:17:05 +03:00
97fb50d9fa
Mastodon Conversation API: Don't return own account in 'accounts'.
2019-05-31 11:27:14 +02:00
1690be991e
Replace missing non-nullable Card attributes with empty strings
2019-05-30 21:03:31 +00:00
91ac8b075b
Merge branch 'use-pleroma-config' into 'develop'
...
Use Pleroma.Config everywhere
See merge request pleroma/pleroma!1214
2019-05-30 13:16:08 +00:00
99f70c7e20
Use Pleroma.Config everywhere
2019-05-30 15:33:58 +07:00
ce47017c89
Merge develop
2019-05-29 18:18:22 +03:00
db94294dfb
[ #936 ] fix tests
2019-05-29 14:04:58 +00:00
1452a96ad6
ability to set and reset avatar, profile banner and backgroud in Mastodon API
2019-05-27 15:31:01 +05:45
5bb843ceec
Merge branch 'refactor/die-httpoison-die' into 'develop'
...
remove @httpoison, @ostatus and @websub compile-time constants
See merge request pleroma/pleroma!1203
2019-05-26 13:33:11 +00:00
79503ce90f
mrf: simple policy: fix matching imported activitypub and ostatus statuses
2019-05-26 02:01:24 +00:00
45e4642a58
tests: chase remote/local removal
2019-05-26 00:20:54 +00:00
59a703fcbe
twitter api: user view: expose user notification settings under pleroma object
2019-05-25 05:31:13 +00:00
0f7eeb0943
tests: add tests for non-follows/non-followers settings
2019-05-25 05:25:40 +00:00
1542cccbbc
tests: chase notification setting changes
2019-05-25 05:22:13 +00:00
56fd7dbdd7
remove @websub and @ostatus module-level constants
2019-05-25 04:43:11 +00:00
80d55d428f
tests: websub: check only that signature validation succeeds or fails
2019-05-25 04:34:16 +00:00
9415932af5
Keep nodeinfo available when not federating
2019-05-25 08:15:12 +08:00
bbea5691da
Mention all people in the beginning of DM
2019-05-24 20:34:23 +00:00
f916e4cdd9
Move the Cache Control header test to its own file
...
We can consolidate our cache control header tests here
2019-05-24 20:33:55 +00:00
a7affbdd6d
Fix tests
2019-05-24 21:41:11 +07:00
f333041a0a
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-24 21:05:57 +07:00
0c53d91f3b
fix merge conflict
2019-05-23 09:45:12 +02:00
8086c7aed6
tests: add tests for banner and avatar removal
2019-05-22 18:53:12 +00:00
19c90d47c4
Normalize poll votes to Answer objects
2019-05-22 21:17:57 +03:00
620908a2db
[ #699 ] add worker to clean expired oauth tokens
2019-05-22 15:44:50 +00:00
714d8d4ef9
Merge branch 'feature/object-pruning' into 'develop'
...
Object pruning
See merge request pleroma/pleroma!1181
2019-05-22 11:04:30 +00:00
ff363f70b5
Merge branch 'refactor/keys' into 'develop'
...
move key generation functions into Pleroma.Keys module
See merge request pleroma/pleroma!1186
2019-05-22 06:28:16 +00:00
cdac5efd10
Merge branch 'bugfix/account_view_source.note' into 'develop'
...
MastoAPI AccountView: fill source.note with plaintext version of note
Closes #926
See merge request pleroma/pleroma!1189
2019-05-22 05:39:01 +00:00
0e2c215a00
MastoAPI AccountView: fill source.note with plaintext version of note
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/926
2019-05-22 07:22:19 +02:00
17bfd000d7
Ability to reset avatar, profile banner and backgroud
2019-05-22 06:47:18 +02:00
79c2cef2fb
Merge branch 'mongooseim-support' into 'develop'
...
MongooseIM: Add basic integration endpoints.
See merge request pleroma/pleroma!1172
2019-05-22 04:06:54 +00:00
ab6e15622b
Merge branch 'fix/api-fallback' into 'develop'
...
Do not fallback to index.html for /api/* routes
Closes #920
See merge request pleroma/pleroma!1182
2019-05-22 04:05:41 +00:00
9134848170
Do not truncate DM when it contains newlines and safe_dm_mentions is set to true
2019-05-22 04:04:20 +00:00
045803346d
move key generation functions into Pleroma.Keys module
2019-05-22 03:58:15 +00:00
f76268135c
Fix failing test
2019-05-22 07:16:11 +08:00
3ab9255eda
Respond with a 404 Not implemented JSON error message
...
when requested API is not implemented
2019-05-22 07:15:52 +08:00
a13d449b24
Add tests for fallback routes
2019-05-22 05:39:29 +08:00
73df9d690d
object: fetcher: add support for reinjecting pruned objects
2019-05-21 21:38:56 +00:00
63b0b7190c
MastoAPI: Add GET /api/v1/polls/:id
2019-05-21 20:40:35 +03:00
0407ffe75f
Change validation error status codes to be more appropriate
2019-05-21 17:12:38 +03:00
aafe30d94e
Handle poll votes
2019-05-21 14:12:10 +03:00
3f96b3e4b8
Enforce poll limits and add error handling for MastodonAPI's post endpoint
2019-05-21 10:54:20 +03:00
76a7429bef
Add poll limits to /api/v1/instance and initial state
2019-05-21 09:13:10 +03:00
d4847b17ca
Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop'
...
Add virtual :thread_muted? field
Closes #901
See merge request pleroma/pleroma!1178
2019-05-20 23:30:19 +00:00
eb02edcad9
Add virtual :thread_muted? field
...
that may be set when fetching activities
2019-05-21 00:35:46 +08:00
dc916ba15f
Format mascot tests
2019-05-20 12:58:17 +01:00
e81f0fc6d4
Add mascot get/set tests
2019-05-20 12:58:06 +01:00
2375e9a95b
Add report filtering to MRF.SimplePolicy
2019-05-20 06:02:50 +08:00
5ece901af3
Resolve merge conflicts and remove IO.inspects
2019-05-18 13:37:38 +03:00
fd920c8973
Mastodon API: Add support for posting polls
2019-05-18 13:29:28 +03:00
dc08159538
also suppress link previews from posts marked #nsfw
2019-05-17 22:13:24 +00:00
0da1233e8e
rich media: suppress link previews if post is marked as sensitive
2019-05-17 18:49:43 +00:00
f959bf7aa6
MongooseIM: Add basic integration endpoints.
2019-05-17 18:21:11 +02:00
557f0e33a7
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-17 19:57:14 +07:00
f2936e0a07
Add `ap_id` to List
2019-05-17 19:56:37 +07:00
249b31ffe5
Fix specs.
2019-05-17 11:49:13 +02:00
7ed682213f
Fix/902 random compile failing
2019-05-17 07:25:20 +00:00
5c028b8f92
user creation admin api will create multiple users
2019-05-17 12:21:58 +05:45
443cd68a4c
Add tests for MRF.SimplePolicy
2019-05-17 09:02:34 +08:00
bf84d50c76
Merge branch 'feature/890-add-report-uri' into 'develop'
...
Feature/890 add report uri
Closes #890
See merge request pleroma/pleroma!1164
2019-05-16 20:11:12 +00:00
2c303afc8b
Remove duplicated entries in users' following lists
2019-05-16 20:04:08 +00:00
e2b3a27204
Add Reports to Admin API
2019-05-16 19:09:18 +00:00
e190b3022b
Merge branch 'fix/domain-unblocked-reblogs' into 'develop'
...
Fix domain-unblocked reblogs
Closes #892
See merge request pleroma/pleroma!1157
2019-05-16 18:57:14 +00:00
ebb0482116
Merge branch 'develop' into conversations-import
2019-05-16 13:11:17 -05:00
fde30aee43
Merge branch 'feature/sql-thread-sat' into 'develop'
...
SQL thread visibility solver
See merge request pleroma/pleroma!971
2019-05-16 13:44:22 +00:00
73ae58fdfa
Feature/896 toggling confirmation
2019-05-16 13:23:41 +00:00
fc7246d715
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-16 17:54:24 +07:00
4711d8151c
try this
2019-05-16 17:35:07 +07:00
aa11fa4864
add report uri and report to
2019-05-16 12:49:40 +07:00
2b6119dfbf
Restrict reblogs of activities from blocked domains
2019-05-16 05:53:51 +08:00
64495b96e9
Add test for blocked domains
2019-05-16 05:53:51 +08:00
62e42b03ab
Handle incoming Question objects
2019-05-15 20:10:16 +03:00
f09c3afdf5
chase test failures
2019-05-15 16:23:01 +00:00
c7644313e7
test: update obsolete test
2019-05-15 15:54:10 +00:00
f168a1cbdc
Merge remote-tracking branch 'origin/develop' into conversations-import
2019-05-15 17:47:29 +02:00
62516be9c4
Merge branch 'fix/public-option-not-working' into 'develop'
...
Fix public option not working
Closes #873
See merge request pleroma/pleroma!1143
2019-05-15 15:42:21 +00:00
4440e23547
Merge branch 'chore/extricate-http-signatures' into 'develop'
...
switch to pleroma/http_signatures library
See merge request pleroma/pleroma!1155
2019-05-15 15:37:31 +00:00
4429c1b7da
tests: fixup
2019-05-15 15:29:42 +00:00
cbb3451023
CommonAPI: Refactor visibility, forbid public to private replies.
2019-05-15 16:30:08 +02:00
ee22fff5ac
remove deprecated PleromaFE configuration
2019-05-15 15:29:59 +05:45
a7a8f3bc2c
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-15 14:31:24 +07:00
70c81b95d0
Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug
2019-05-15 05:09:32 +08:00
7b8dc99ef1
Implement Pleroma.Plugs.EnsurePublicOrAuthenticated
2019-05-15 05:09:29 +08:00
071f78733a
switch to pleroma/http_signatures library
2019-05-14 20:03:13 +00:00
dfd031c26a
Merge branch 'fix/pleroma-config-get-when-value-is-false' into 'develop'
...
Fix Pleroma.Config.get!/1 raising an error when value is false
See merge request pleroma/pleroma!1148
2019-05-14 14:58:45 +00:00
52297920e7
Refactoring oauth response.
2019-05-14 14:49:45 +00:00
d474995efa
Add Tests
2019-05-14 20:12:47 +07:00
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-05-14 18:15:56 +07:00
a18b2c0b12
Fix Pleroma.Config.get!/1 raising an error when value is false
2019-05-14 06:40:59 +08:00
b14a314ce7
Merge branch 'feature/federator-behaviours' into 'develop'
...
federator modularization (outgoing)
See merge request pleroma/pleroma!1140
2019-05-13 18:58:04 +00:00
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
2019-05-13 18:35:45 +00:00
7701a4c841
Make irreversible field default to false in filters
2019-05-14 00:13:15 +05:45
15cda998f3
Add a test to ensure create_or_bump_for does not normalize objects before checking the activity type
2019-05-13 10:32:04 +03:00
582bd9d170
tests: fix AP test failures
2019-05-12 14:40:57 +00:00
d823eb921b
tests: fix salmon tests
2019-05-12 14:35:38 +00:00
2b847d4add
tests: chase federator publish_single_foo removals
2019-05-12 05:04:24 +00:00
131f883207
Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop'
...
Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
See merge request pleroma/pleroma!1129
2019-05-11 16:52:26 +00:00
f01f995816
make url uniform in admin api
2019-05-11 14:46:00 +05:45
f1f7a11222
Merge develop
2019-05-11 14:45:54 +07:00
2a54e8c1f5
Use "repeated" instead of "retweeted" for repeated statuses in Twitter API
...
This makes it consistent with the language used in Pleroma FE (at least
in English).
Resolves https://git.pleroma.social/pleroma/pleroma-fe/issues/533
2019-05-09 19:58:34 -04:00
e4523c3010
Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
2019-05-09 22:27:00 +03:00
a33bec7d58
Conversations: Import order, import as read.
2019-05-09 16:39:28 +02:00
a4598b5e8b
Visibility: Make it more resilient.
2019-05-08 18:08:50 +02:00
fcf2f38d20
Conversations: Add a function to 'import' old DMs.
2019-05-08 17:37:00 +02:00
bfeb33e951
Merge develop
...
Merge conflict in lib/pleroma/activity.ex
2019-05-08 14:34:36 +00:00
b6b5b16ba4
Merge develop
2019-05-08 17:08:06 +07:00
4c5125dedc
Remove `bookmarks` assoc and add a fake `bookmark` assoc instead
2019-05-07 19:33:22 +00:00
3a7c14645e
- Actually use preloaded bookmarks in views
...
- Preload bookmarks in bookmark timeline
- Rework bookmark preload tests
2019-05-07 19:33:22 +00:00
f841eb7cdb
Preload bookmarks wherever the object is preloaded
2019-05-07 19:33:22 +00:00
238dd72fad
Merge branch 'conversations_three' into 'develop'
...
Conversations once more.
See merge request pleroma/pleroma!1119
2019-05-07 14:43:21 +00:00
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-05-07 16:51:11 +07:00
1040caf096
fix format
...
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
2019-05-06 17:51:03 +00:00
aacac9da0b
Merge branch 'feature/bbs' into 'develop'
...
BBS / SSH
See merge request pleroma/pleroma!997
2019-05-06 17:17:03 +00:00
ce6ca0fefe
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
2019-05-06 16:45:22 +00:00
eb0fb73ddb
BBS: Credo fixes.
2019-05-04 15:47:50 +02:00
c58fd4c038
BBS: Fix tests.
2019-05-04 15:36:48 +02:00
4c76f49e60
BBS: small fixes.
2019-05-04 15:06:18 +02:00
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
2019-05-04 15:00:45 +02:00
b5ad1715b2
MastoAPI: profile update with emoji_map
2019-05-03 16:41:23 +02:00
2f76a40d02
formatter.ex: Add get_emoji_map/1
2019-05-03 16:27:50 +02:00
d70af32127
Pleroma.User: remove emojify on parse_bio
2019-05-03 16:27:50 +02:00
85b5c60694
Pleroma.Formatter: width/height to class=emoji
2019-05-03 16:25:58 +02:00
81d1aa424d
Streamer: Stream out Conversations/Participations.
2019-05-03 13:39:14 +02:00
497d34b825
Merge branch 'iss-849' into 'develop'
...
Parse access_token from body parameters and URL parameters
See merge request pleroma/pleroma!1103
2019-05-02 14:17:17 +00:00
a53a6c9d64
Add oauth plug tests for url and body parameters
2019-05-02 22:25:21 +09:00
8af55728e4
Fix tests
2019-05-01 19:03:55 +02:00
45f790becc
Merge remote-tracking branch 'origin/develop' into conversations_three
2019-05-01 18:40:41 +02:00
c854bff8f5
Refactored Pleroma.Web.Auth.Authenticator
2019-05-01 13:28:04 +00:00
0bcdaf378e
Merge branch 'bugfix/web-notification-special-char' into 'develop'
...
fix the web push notification with special char for status created
See merge request pleroma/pleroma!1092
2019-05-01 10:45:32 +00:00
f11e7037c2
test fixes
2019-05-01 16:09:53 +07:00
cd6da3606b
Merge branch 'develop' into bugfix/web-notification-special-char
2019-05-01 00:21:30 +05:45
0f0cc2703b
Merge develop
2019-04-30 20:17:52 +07:00
b0951a8849
WebPush: Use Object.normalize, rewrite tests so they test reality.
2019-04-29 18:15:30 +02:00
0fd176b990
Merge branch 'fix/add-default-scope-mastoapi' into 'develop'
...
Add default_scope to /api/v1/update_credentials
See merge request pleroma/pleroma!1100
2019-04-29 06:45:18 +00:00
292c69481b
Merge branch 'regression/rights-only-for-admin' into 'develop'
...
Fix `rights` in TwitterAPI's user entity being present only for Admins/Moderators
See merge request pleroma/pleroma!1102
2019-04-28 23:05:14 +00:00
61ca2f7a4e
Fix `rights` in TwitterAPI's user entity being present only for
...
Admins/Moderators
In !1093 I reused `maybe_with_role` for `rights` object, however I
missed that `maybe_with_role` is called only for admins/moderators.
2019-04-28 19:42:43 +03:00
ce3789e39a
Add default_scope to /api/v1/update_credentials
2019-04-27 23:55:54 +03:00
c3e9fcf098
Fix bookmarks depending on embeded object and move checking if the
...
status is bookmarked to SQL
2019-04-27 23:06:46 +03:00
002ea343f8
Merge branch 'feature/bbcode' into 'develop'
...
BBCode support (backend)
See merge request pleroma/pleroma!1097
2019-04-27 07:44:24 +00:00
ef52aa0e66
tests: fix up for changed bbcode library output and verify html is properly escaped
2019-04-26 22:45:45 +00:00
501af917b5
add support for bbcode
2019-04-26 22:35:02 +00:00
4de5fef1f8
Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'
...
Feature/807 bookmark endpoint extension
Closes #807
See merge request pleroma/pleroma!1059
2019-04-26 11:59:47 +00:00
48f68fd133
Merge branch 'feature/mastoapi-new-config' into 'develop'
...
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
This patch:
- Fixes `rights` in TwitterAPI ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
See merge request pleroma/pleroma!1093
2019-04-26 02:41:35 +00:00
24c3e2db2c
Add mediaproxy whitelist capability
2019-04-25 18:11:47 -05:00
dfc8425659
Move settings to Source subentity
2019-04-25 10:31:14 +03:00
85953c0836
fixes for tests
2019-04-25 13:46:40 +07:00
c157e27a00
Merge branch 'develop' into feature/disable-account
2019-04-25 13:41:10 +07:00
73d01857e3
bookmarks in separate table
2019-04-25 13:38:24 +07:00
0fd0ffcd76
activitypub: transmogrifier: send reject follow if following does not succeed
2019-04-25 00:48:45 +00:00
4baea6e6d9
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
...
This patch:
- Fixes `rights` in twitterapi ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
2019-04-24 20:01:42 +03:00
963d5774af
fix the status notification with special char
2019-04-24 07:06:17 +05:45
030a7876b4
Merge branch 'security/fix-html-class-scrubbing' into 'develop'
...
html: lock down allowed class attributes to only those related to microformats
See merge request pleroma/pleroma!1090
2019-04-23 23:07:56 +00:00
f5535e5743
html: lock down allowed class attributes to only those related to microformats
2019-04-23 23:03:45 +00:00
9dd36e5bcb
Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )
2019-04-23 02:47:43 +00:00
f60d072bbb
Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
2019-04-22 11:54:27 +03:00
b9cdf6d3b9
Use `User.get_cached*` everywhere
2019-04-22 07:20:43 +00:00
88f0be9693
Feature/826 healthcheck endpoint
2019-04-22 07:19:53 +00:00
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-04-22 13:08:30 +07:00
7fcbda702e
Merge branch 'rework-emoji-management' into 'develop'
...
Remove finmoji and add a way to download emojis in packs
Closes #817 and #821
See merge request pleroma/pleroma!1073
2019-04-22 02:07:19 +00:00
2662bea4e0
Add accounts and last_status to conversation read response
2019-04-21 20:26:13 +07:00
9256d2d4b4
[ #923 ] Refactored OAuthController#authorize definitions, added test.
2019-04-21 10:51:32 +03:00
375fd21055
Set correct values in the MastoAPI reblog status view
2019-04-21 05:40:22 +03:00
724311e151
Fix Credo warnings
2019-04-20 19:57:43 +07:00
60f213bb1a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
2019-04-20 19:43:06 +07:00
aef3a3ca46
Fix tests that used finmoji
2019-04-20 11:34:00 +03:00
52ed287e87
Fix incorrect multiple emoji tag handling introduced in initial impl
2019-04-20 11:17:17 +03:00
fa48532387
Handle `reblogs` on the first follow request in MastoAPI
2019-04-20 04:39:49 +03:00
9da8b287f8
Merge branch 'feature/database-compaction' into 'develop'
...
database compaction
See merge request pleroma/pleroma!473
2019-04-19 16:55:33 +00:00
73407f4eea
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
2019-04-19 23:27:13 +07:00
bc7862106d
Fix tests
2019-04-19 23:26:41 +07:00
8add119444
Add User.list_inactive_users_query/1
2019-04-19 22:19:00 +07:00
aeafa0b2ef
Add Notification.for_user_since/2
2019-04-19 22:16:17 +07:00
ada384207b
typo fix
...
docs for RelMe provider
2019-04-19 07:50:21 +00:00
218d96a26b
Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'
...
OAuth consumer params handling refactoring
See merge request pleroma/pleroma!1047
2019-04-19 07:49:26 +00:00
4ef237f26a
Fix my incorrect search test fix
2019-04-18 14:37:57 +03:00
83589ca6a5
Merge branch 'develop' into feature/database-compaction
2019-04-18 12:56:38 +03:00
6069d0fd36
Fix object search depending on embeded object
2019-04-18 09:28:20 +03:00
2abc09570f
Use the preloaded object in tag queries
2019-04-18 01:37:04 +03:00
36f78c6dcd
activitypub: fix filtering of boosts from blocked users
2019-04-17 22:27:59 +00:00
2140e164d7
activitypub: properly filter out transitive activities concerning blocked users
2019-04-17 20:05:09 +00:00
35ac672b8d
Remove containment tests from transmogrifier and fix thread visibility solver
2019-04-17 17:59:15 +03:00
d1eb578a57
Refactor tests that used ActivityPub.fetch_object_from_id
2019-04-17 17:03:35 +03:00
8e4d950f31
Remove updating reply count for embeded objects
2019-04-17 15:54:09 +03:00
ff8d76c670
Refactor all tests that acessed the embeded object
2019-04-17 15:46:59 +03:00
54b82f236b
Fix note count test
2019-04-17 15:03:17 +03:00
ad681877df
Make credo happy
2019-04-17 14:52:01 +03:00
e7c3c36766
Update functions in object fetcher for tesla and set up a proper mock for tests
2019-04-17 14:21:39 +03:00
b09ae02c04
Added some more normalization calls all in mastodon api controller
2019-04-17 13:04:58 +03:00
2f0203a4a1
Resolve conflicts
2019-04-17 16:59:05 +07:00
87013f8438
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
2019-04-17 16:58:08 +07:00
dda4e0e2a8
Fix warnings in object tests
2019-04-17 12:27:29 +03:00
627e5a0a49
Merge branch 'develop' into feature/database-compaction
2019-04-17 12:22:32 +03:00
73df3046e0
Merge branch 'feature/788-separate-email-addresses' into 'develop'
...
Feature/788 separate email addresses
Closes #788
See merge request pleroma/pleroma!1040
2019-04-16 18:44:07 +00:00
cde7711b12
Merge branch 'bugfix/relax-spam-protection' into 'develop'
...
activitypub: allow indirect messages from users being followed at a personal inbox
See merge request pleroma/pleroma!1069
2019-04-16 18:38:11 +00:00
d4a749cfb2
Handle new-style mastodon follow lists
...
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
2019-04-16 18:35:38 +00:00
750b369d04
activitypub: allow indirect messages from users being followed at a personal inbox
2019-04-16 18:31:12 +00:00
76999c73a7
Conversation: Add accounts to output.
2019-04-15 22:28:42 +02:00
0da985182f
Conversation: Return full status object, id is a string.
2019-04-15 21:58:58 +02:00
c1ebb38d3a
Conversation: Also create participations for remote users.
...
Needed to get the participating user list.
2019-04-15 21:45:25 +02:00
56956de6fa
Merge branch 'fix/status-reblogged' into 'develop'
...
Assign reblogged in the Mastodon reblog status view
Closes #812
See merge request pleroma/pleroma!1057
2019-04-15 10:26:23 +00:00
f358295cbe
Merge branch 'unfollow-oneself' into 'develop'
...
Consistent response for self follow/unfollow
Closes #819
See merge request pleroma/pleroma!1061
2019-04-15 10:24:37 +00:00
27d78dc526
Use User.get_cached_by*
2019-04-15 12:37:49 +03:00
fd2e31af86
oops
2019-04-15 11:59:01 +03:00
5d73dca064
Remove inReplyToStatusId
2019-04-15 11:50:36 +03:00
507e7821e3
Handle follow/unfollow directed to themselves
2019-04-15 10:21:18 +03:00
dc21181f65
Update updated_at field on notification read
2019-04-14 22:29:05 +07:00
679a8ef629
Assign reblogged in the Mastodon reblog status view
2019-04-14 11:35:15 +03:00
0cd4b6024d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
2019-04-14 14:05:21 +07:00
371a4aed2c
Add User.Info.email_notifications
2019-04-13 17:40:42 +07:00
c5d0fffeaf
naming fix
2019-04-13 14:55:42 +07:00
c349573791
Merge develop to 788-separate-email-addresses
...
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
2019-04-13 12:24:38 +07:00
184ae60b21
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
...
Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029
2019-04-12 10:41:09 +00:00
d0304b4f92
more tests
2019-04-12 16:51:28 +07:00
dd097a406b
add tests
2019-04-12 16:38:32 +07:00
0a09692c7d
Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'
...
Features: mastoapi-2.6.0 `min_id` pagination
Closes #351
See merge request pleroma/pleroma!976
2019-04-12 09:34:12 +00:00
711ade961e
adding destroy multiple for mastofe
2019-04-12 02:28:46 +00:00
e03d24af96
in_reply_to_id - null
2019-04-12 02:21:32 +00:00
6f880b1627
Conversation: Fix tests.
2019-04-11 13:31:20 +02:00
36ec8d9694
ActivityPub: Fix specs.
2019-04-11 13:20:46 +02:00
c3f12cf3c3
[ #923 ] OAuth consumer params handling refactoring.
...
Registration and authorization-related params are wrapped in "authorization" in order to reduce edge cases number and simplify handling logic.
2019-04-10 21:40:38 +03:00
c352a0aba6
Conversations: Make tests run.
2019-04-10 17:48:31 +02:00
cf353514fe
Participations: Add last activity.
2019-04-10 17:28:02 +02:00
20d9b90760
Participation: Get for a user.
2019-04-10 17:05:33 +02:00
280172f6f6
Conversations: Create or bump on inserting a dm.
2019-04-10 16:33:45 +02:00
64c1c3a407
Participations: Add marking as read and unread.
2019-04-10 15:12:01 +02:00
d1da6b155a
Conversation: Add Conversations and Participations.
2019-04-10 15:01:42 +02:00
fe511a6c65
Merge branch 'develop' into feature/788-separate-email-addresses
2019-04-10 18:06:54 +07:00
fe13a1d78c
adding notify_email setting for trigger emails
2019-04-10 17:57:41 +07:00
e5d553aa45
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
...
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
2019-04-10 10:10:08 +00:00
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
2019-04-10 10:44:54 +01:00
b5cecebbc1
Conversations: Fix specs.
2019-04-10 09:32:17 +02:00
c8440b5e0c
Merge branch 'fix/emoji-api-nonsense' into 'develop'
...
Change response format of /api/pleroma/emoji so it makes sense
See merge request pleroma/pleroma!1038
2019-04-10 06:22:51 +00:00
9c1b36856b
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/
2019-04-10 06:33:20 +02:00
97395e013e
Merge branch 'notification-pleroma-settings' into 'develop'
...
Notification controls
Closes #738
See merge request pleroma/pleroma!988
2019-04-10 02:10:31 +00:00
b57b43027c
Change response format of /api/pleroma/emoji to the one that actually makes sense
2019-04-09 23:20:31 +03:00
144648de92
Merge branch 'mastoapi/plaintext-statuses' into 'develop'
...
Provide plaintext representations of content/cw in MastoAPI
Closes #787
See merge request pleroma/pleroma!1035
2019-04-09 17:25:31 +00:00
0a02ed7a2f
Merge branch 'bugfix/follower_count' into 'develop'
...
update the follower count when a follower is blocked
See merge request pleroma/pleroma!1033
2019-04-09 07:30:38 +00:00
07afb9b537
update the follower count when a follower is blocked
2019-04-09 09:15:45 +05:45
fee50636d0
removing not needed invite update
2019-04-08 20:08:16 +07:00
a9f805c871
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
2019-04-08 14:10:51 +02:00
9abf832b03
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
2019-04-08 18:48:10 +07:00
13ff312c48
Sever subscription in case of block
2019-04-08 12:46:12 +01:00
e19590c93f
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
...
Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019
2019-04-08 11:42:20 +00:00
fd45cab9ec
Merge branch 'twitter_oauth' into 'develop'
...
OAuth consumer (sign in / sign up with external provider)
See merge request pleroma/pleroma!923
2019-04-08 11:41:50 +00:00
36c0a10fdf
adding language tag
2019-04-08 11:03:10 +00:00
f0ca0696c8
test for valid_invite?
2019-04-08 17:06:04 +07:00
23067908de
Merge branch 'feature/770-add-emoji-tags' into 'develop'
...
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
2019-04-08 09:50:00 +00:00
c3d5c3513a
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
2019-04-08 16:46:59 +07:00
44829d9181
AdminApiControllerTest unused variables fix.
2019-04-08 12:32:55 +03:00
a1a854646e
Merge branch 'develop' into use-jobs-in-webpush
2019-04-08 16:29:20 +07:00
bffddf5e31
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# docs/config.md
# test/support/factory.ex
2019-04-08 12:20:26 +03:00
b4da2bc1d0
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
...
# Conflicts:
# config/config.exs
# docs/config.md
2019-04-08 09:18:01 +00:00
b177e1e7f3
Merge branch 'scheduled-activities' into 'develop'
...
Scheduled activities
See merge request pleroma/pleroma!989
2019-04-08 09:08:18 +00:00
012bb5dcc9
renaming expire_at -> expires_at
...
keyword style change
2019-04-08 16:01:28 +07:00
76fdfd1c7f
Add check on activity visibility in sub notification
2019-04-07 15:11:29 +01:00
b810aac117
added docs to docs/api/admin_api.md
...
code style and little renamings
2019-04-07 19:48:52 +07:00
fb2040d061
Merge branch 'fix/deactivated-user-error' into 'develop'
...
Return 403 for deactivated user on token request
Closes #785
See merge request pleroma/pleroma!1031
2019-04-06 22:19:30 +00:00
2056efa714
Add scheduler for sending scheduled activities to the queue
2019-04-06 23:56:29 +03:00
fc92a0fd8d
Added limits and media attachments for scheduled activities.
2019-04-06 23:55:58 +03:00
b3870df51f
Handle `scheduled_at` on status creation.
2019-04-06 23:55:58 +03:00
7bf622ce73
Add scheduled activities
2019-04-06 23:55:58 +03:00
7aa53d52bd
Return 403 on oauth token exchange for a deactivated user
2019-04-06 23:27:55 +03:00
876965a7e7
Merge branch 'fix/failed-legacy-test' into 'develop'
...
Mock :crypt.crypt/2 to pass LegacyAuthenticationPlugTest on Mac OS
See merge request pleroma/pleroma!1030
2019-04-06 16:03:35 +00:00
ce8d457132
little channges
2019-04-06 22:38:35 +07:00
76d8928cf1
fix for field name
2019-04-06 20:49:43 +07:00
7410aee886
Merge develop to 770-add-emoji-tags
...
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
2019-04-06 20:34:00 +07:00
dcc54f8cfa
admin api endpoints for invites
2019-04-06 20:25:19 +07:00
47b07cec49
token -> invite renaming
2019-04-06 20:24:22 +07:00
be54e40890
twitter api registration
...
fix for twitter api tests
2019-04-06 17:18:59 +07:00
0484f3a8b1
generating tokens with mix
2019-04-06 16:58:22 +07:00
325a268017
Redirect to the referer url after mastofe authorization
2019-04-05 23:36:42 +00:00
e9c075d05c
Mock :crypt.crypt/2 because otherwise the test fails on Mac OS
2019-04-05 22:48:11 +02:00
fac76bfa35
We actually want the user id not nickname in the test...
2019-04-05 12:11:19 -05:00
c746087f57
Also remove Repo functions in the tests
2019-04-05 11:59:56 -05:00
7895ee37fa
Add user following / unfollowing to the admin api.
2019-04-05 11:27:07 -05:00
a270e7a191
Mix format everything
2019-04-05 17:07:58 +01:00
f6e131eeb9
Don't use twitterAPI for subscription tests
2019-04-05 17:02:09 +01:00
9ca91cbb87
Change relationship direction of subscriptions
2019-04-05 17:02:07 +01:00
73afd13c21
Add subscription key to one test I forgot about
2019-04-05 15:37:36 +01:00
06cd547fc6
Format subscriptions related stuff
2019-04-05 15:30:34 +01:00
d56866c824
Add subscribed status to user view
...
Added in pleroma extensions, but can be moved whenever
2019-04-05 15:30:31 +01:00
75c4ceb4a2
Add tests for subscriptions
2019-04-05 15:30:29 +01:00
f1712cd2f1
Use PleromaJobQueue in Pleroma.Web.Push
2019-04-05 19:38:44 +07:00
47a236f753
[ #923 ] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
2019-04-05 15:12:02 +03:00
3e7f2bfc2f
[ #923 ] OAuthController#callback adjustments (with tests).
2019-04-05 09:19:17 +03:00
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
2019-04-04 23:43:08 +03:00
f7cd9131d4
[ #923 ] OAuth consumer controller tests. Misc. improvements.
2019-04-04 22:41:03 +03:00
cfa6e7289f
Improve Transmogrifier.upgrade_user_from_ap_id/2
2019-04-04 16:10:43 +07:00
0cb94cfa94
Merge branch 'fix-slow-relationships' into 'develop'
...
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
See merge request pleroma/pleroma!1011
2019-04-02 18:43:48 +00:00
256b492a58
Merge branch 'bugfix/wrong-date-format' into 'develop'
...
Support activities with dates in the Unix timestamp format
Closes #763
See merge request pleroma/pleroma!1004
2019-04-02 14:18:23 +00:00
a79ce94dd4
Merge branch 'feature/fake-statuses' into 'develop'
...
Add fake status submit
See merge request pleroma/pleroma!995
2019-04-02 14:17:43 +00:00
39bcf93007
Merge remote-tracking branch 'origin/develop' into fix-slow-relationships
2019-04-02 16:10:38 +02:00
fd07745d1b
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
2019-04-02 16:08:55 +02:00
fa8483cb80
Merging develop into feature/770-add-emoji-tags
...
Conflict test/web/twitter_api/util_controller_test.exs
2019-04-02 20:39:52 +07:00
180b87257c
Merge branch 'bugfix/share-mastodon' into 'develop'
...
[OStatus] adds status to pleroma instance if the url given is a status
See merge request pleroma/pleroma!1002
2019-04-02 12:47:40 +00:00
ce9284b36f
Merge branch 'remove-user-activities' into 'develop'
...
[#757 ] Add mix task to delete user's activities
See merge request pleroma/pleroma!1008
2019-04-02 12:45:29 +00:00
b95cf3d490
Merge branch 'get_by_id' into 'develop'
...
Replace `Repo.get_by` with existing functions
See merge request pleroma/pleroma!1010
2019-04-02 12:43:28 +00:00
9e0567ec52
Merge develop into feature/770-add-emoji-tags
2019-04-02 19:16:29 +07:00
fdb4357e9b
Rename fake param to preview and make the tests check that the object was not inserted to the db
2019-04-02 14:31:18 +03:00
20c619f85f
replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)` in tests
2019-04-02 17:58:32 +07:00
091baf9316
Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'
...
MastoAPI 2.6.0 `force_login` option
Closes #734
See merge request pleroma/pleroma!999
2019-04-02 10:57:38 +00:00
26d509cc86
Merge branch 'get_by_id' into 'develop'
...
Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible
See merge request pleroma/pleroma!1009
2019-04-02 10:52:29 +00:00
95c92c49c9
Fix account lookup for nicknames beginning with numbers
2019-04-02 10:51:33 +00:00
9a59c26619
replace `Repo.get_by(User, ap_id: ap_id)` with `User.get_by_ap_id(ap_id)`
2019-04-02 17:47:52 +07:00
15ce710460
Added "GET /oauth/authorize" tests.
2019-04-02 13:43:33 +03:00
11c2d6bdc4
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)` in tests
2019-04-02 17:08:03 +07:00
1b3d921921
change `Repo.get(User, id)` => `User.get_by_id(id)`
2019-04-02 17:01:26 +07:00
3db9235150
Ignore dates in wrong formats
2019-04-02 11:32:36 +02:00
a14742f495
add `user delete_activities` mix task
2019-04-02 16:30:11 +07:00
484162c187
test fix
2019-04-02 16:26:40 +07:00
9b2188da7c
refactoring of emoji tags config to use groups
2019-04-02 15:44:56 +07:00
aac48d0cc6
Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations
2019-04-02 09:19:10 +03:00
6386c1c9c1
fetch url for OStatus to know if it is a/c or status
2019-04-02 10:26:09 +05:45
b6f9f7b8aa
Handle dates in the Unix timestamp format ( Fixes #763 )
2019-04-01 22:45:24 +02:00
1d01e8e656
[OStatus] adds status to pleroma instance if the url given is a status
2019-04-01 22:26:58 +05:45
17d3d05a71
code style
...
little fix
2019-04-01 17:54:30 +07:00
3601f03147
Adding tag to emoji ets table
...
changes in apis
2019-04-01 17:17:57 +07:00
e3bf6655ba
Add replying.
2019-03-31 21:24:29 +02:00
10fdc080a0
BBS: Tests and formatting.
2019-03-31 20:35:10 +02:00
1bb4d5d65b
Implement fake status submit
2019-03-29 21:59:04 +03:00
9a39d1d846
Replace Pleroma.Jobs with `pleroma_job_queue`
2019-03-29 12:46:05 +00:00
6b407872b4
mastodon_api_controller.ex: Use min_id in link header instead of since_id
2019-03-28 17:23:21 +01:00
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
2019-03-28 18:55:16 +03:00
55d086b520
Notification controls
...
Allow users to configure whether they want to receive notifications from people they follow / who follow them, people from remote / local instances
2019-03-28 07:52:07 +03:00
10c81fc902
Add user show endpoint for Pleroma admin API
2019-03-27 21:44:15 +03:00
926bf114b7
Merge branch 'feature/more-user-filters' into 'develop'
...
Add more user filters + move search to its own module
See merge request pleroma/pleroma!982
2019-03-27 11:33:13 +00:00
776bb5137f
Fix muting reblogs tests
2019-03-27 13:43:43 +03:00
3cf7539bca
Add more user filters + move search to its own module
2019-03-27 03:51:59 +05:00
a4ab60ac54
Add vapid_key to the `POST /api/v1/apps` response
2019-03-26 23:27:37 +03:00
691d1208b5
Add GET /api/v1/apps/verify_credentials
2019-03-26 21:53:28 +03:00
ff3b09f6b3
Merge branch 'fix/ap-icon' into 'develop'
...
Do not federate instance avatar
Closes #759
See merge request pleroma/pleroma!977
2019-03-26 16:12:50 +00:00
c6ab5ebe7c
Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'
...
Mastodon 2.7.2 instance attributes (registrations, languages)
See merge request pleroma/pleroma!979
2019-03-26 16:01:52 +00:00
10a7a4a868
AP UserView: Refactor banner / avatar display code, add test.
2019-03-26 16:59:28 +01:00
47b49ab1a1
Test for MastoAPI /api/v1/instance response structure (formatting fix).
2019-03-26 18:18:36 +03:00
9e3899bf36
Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'
...
Mastodon-based auth error messages. User#auth_active?/1 refactoring.
See merge request pleroma/pleroma!978
2019-03-26 15:13:55 +00:00
caf0e9cf33
Test for MastoAPI /api/v1/instance response structure.
2019-03-26 18:13:24 +03:00
21ff78cd40
Merge branch 'replies-count' into 'develop'
...
Increment replies_count (MastoAPI)
Closes #756
See merge request pleroma/pleroma!974
2019-03-26 14:49:09 +00:00
aacdcac1be
Credo is upset about me not remembering the alphabet
2019-03-26 17:35:45 +03:00
087662d4fb
Fix formatting
2019-03-26 17:18:18 +03:00
406d19331f
Remove ActivityRepresenter
2019-03-26 17:16:21 +03:00
568e348588
Increment replies_count on replies (MastoAPI)
2019-03-26 15:27:04 +03:00
263ca3dea2
Mastodon-based auth error messages. Defaulted User#auth_active?/1 to `true`.
2019-03-26 15:09:06 +03:00
26b0c802c3
fix up missing announcements with preloads
2019-03-25 07:38:09 +00:00
a32bcab04b
Merge branch 'fix/eldap-warnings' into 'develop'
...
Ignore compilation warnings for undefined module :eldap
See merge request pleroma/pleroma!956
2019-03-24 11:17:40 +00:00
4a3dd86a55
tests: fix up activity collision test
2019-03-23 03:17:51 +00:00
aaec91b9a1
relay test: don't do preloading (since follow objects are activities, it's a mess)
2019-03-23 01:23:02 +00:00
73efe95368
activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)
2019-03-23 01:09:12 +00:00
fee360e581
Merge branch 'safe-mentions' into 'develop'
...
NodeInfo: Return safe_dm_mentions feature flag.
See merge request pleroma/pleroma!964
2019-03-22 11:03:56 +00:00
e2afce34b6
NodeInfo: Return safe_dm_mentions feature flag.
2019-03-22 11:57:20 +01:00
3229c7a1d6
Ensure fts is prefered over trigram and use union_all instead of union in user search query
2019-03-22 08:39:49 +03:00
1c3d3d0c2b
Merge branch 'safe-mentions' into 'develop'
...
Add safe dm mode option.
See merge request pleroma/pleroma!958
2019-03-22 00:50:24 +00:00
a223e65f35
tests: fixup
2019-03-21 23:56:57 +00:00
3cc2554fa3
mastodon api: add conversation_id extension (ref #674 )
2019-03-21 23:25:41 +00:00
fea3696799
common api: move context functions from twitterapi
2019-03-21 23:24:04 +00:00
bf27190f7f
UtilController: Return state of safe dm mentions.
2019-03-21 16:20:58 +01:00
f858df819b
Skip tests in LDAPAuthorizationTest if :eldap module is unavailable
2019-03-21 12:31:16 +02:00
b68fb3dc17
Merge branch 'imageoptim' into 'develop'
...
used imageOptim to reduce size of image files
See merge request pleroma/pleroma!944
2019-03-21 00:59:24 +00:00
8468f3f6d4
Add safe dm mode option.
2019-03-20 21:09:36 +01:00
ed8a2935f5
Use ILIKE to search users
2019-03-20 01:37:40 +03:00
455bb526f6
test: add test for list sanitization
2019-03-19 17:53:40 +00:00
fd0aa58ee0
tests: add test for as:Public issues
2019-03-19 17:49:29 +00:00
00c5d7248f
fix UploadTest to use new image_tmp.jpg
2019-03-19 10:10:48 +01:00
a907522690
used imageOptim to reduce size of image files
2019-03-19 10:10:48 +01:00
43bd7f47db
Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop'
...
Order users by nickname
See merge request pleroma/pleroma!945
2019-03-18 23:08:31 +00:00
1588688a11
Added support for exclude_types, limit, and min_id in Mastodon
...
notifications.
Unify Mastodon-compatible pagination logic.
2019-03-18 11:27:27 +03:00
42d034505a
Add test for conversation API beforehand
2019-03-17 16:51:26 +01:00
4ed2618f6c
Allow 'rel' attribute on `<a>` link with specific values (for hashtag recognition).
2019-03-17 11:03:19 -04:00
76a13bc5a2
Fix test
2019-03-17 13:29:28 +03:00
93291c3d7a
Order users by nickname
2019-03-17 13:23:31 +03:00
6d6f48d079
Merge branch 'feature/federated-flags' into 'develop'
...
Federated reports
See merge request pleroma/pleroma!935
2019-03-16 19:27:56 +00:00
28df397454
Merge branch 'feature/oauth-me' into 'develop'
...
oauth: add me property to token responses
See merge request pleroma/pleroma!942
2019-03-16 08:44:02 +00:00
c69dc2acf1
Merge branch 'feature/reblog-muting' into 'develop'
...
Implement mastodon's reblog hiding feature
See merge request pleroma/pleroma!916
2019-03-16 04:31:31 +00:00
40134598a8
test: fix defective ldap setup/teardown
2019-03-16 04:05:19 +00:00
e0edc706cf
oauth: add me property to token responses
2019-03-16 01:12:50 +00:00
43fb03be5a
Allow to mark a single notification as read
2019-03-15 23:56:14 +03:00
8b352af4dd
Merge branch 'feature/openldap-support' into 'develop'
...
OpenLDAP support
Closes #203
See merge request pleroma/pleroma!859
2019-03-15 19:57:09 +00:00
a070dd4a83
Add tests for LDAP authorization
2019-03-15 16:28:46 +02:00
ebfc10c834
Fix streamer test
2019-03-15 14:20:08 +01:00
da53c079db
Refactor to store user ap_id, add tests
2019-03-15 14:20:08 +01:00
13c298d354
Fix tests to assume reblogs shown by default
2019-03-15 14:18:21 +01:00
41fc67aa49
Merge branch 'mastoapi/mime_type' into 'develop'
...
Extend MastoAPI to provide attachment mimetypes
See merge request pleroma/pleroma!938
2019-03-15 09:48:50 +00:00
d7a34b604b
Extend MastoAPI to provide attachment mimetypes
2019-03-15 11:58:12 +03:00
0f42ea87d6
Merge branch 'notifications-is-seen' into 'develop'
...
MastoAPI notifications is_seen
See merge request pleroma/pleroma!934
2019-03-15 02:59:17 +00:00
100413bf2c
Add `is_seen` to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests
2019-03-15 01:35:48 +03:00
cbdd11c381
Merge develop to bump elixir version in the CI so I don't get failing formatting
2019-03-14 22:33:20 +03:00
355f285a86
Fix uploaded media plug test
2019-03-14 22:26:54 +03:00
414d4b8088
test: add a test for accepting inbound Flag activities
2019-03-14 19:04:33 +00:00
e2fe796c63
Add some tests
2019-03-14 22:02:48 +03:00
257d8e78e5
Add tags
2019-03-14 01:52:24 +03:00
4872914d32
Add test when local is false
2019-03-13 17:56:15 +03:00
d5edff6ce6
Fix test
2019-03-13 16:14:31 +03:00
490d9cf7b1
Add "local" to users admin API
2019-03-13 16:04:44 +03:00
23960309a0
[Credo] Change quoted string with 3+ quotes to sigils
2019-03-13 04:26:56 +01:00
c42d34b2ec
[Credo] fix Credo.Check.Readability.MaxLineLength
2019-03-13 04:26:56 +01:00
fb82f6fc7c
[Credo] Remove parentesis on argument-less functions
2019-03-13 04:26:56 +01:00
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
2019-03-13 04:26:54 +01:00
6c8743d0c0
[Credo] Fix the warnings
2019-03-13 04:17:30 +01:00
25eb6cf1cb
Add "roles" to users admin API
2019-03-12 22:15:28 +03:00
c231ed610a
Merge branch 'masto-api-followers-following' into 'develop'
...
MastoAPI followers/following endpoints
See merge request pleroma/pleroma!924
2019-03-12 16:27:47 +00:00
984b5f8adf
MastoAPI followers/following endpoints
2019-03-12 16:01:24 +03:00
faf238c1b0
Fix upload tests
2019-03-12 15:33:15 +03:00
3474066f6d
MastoAPI Accounts: Add fetching by nickname.
...
This is to make it easier for the frontends to handle domain.com/users/nickname
urls.
2019-03-11 15:18:32 +01:00
2c8deecdd2
Merge branch 'add-local-field-to-status' into 'develop'
...
MastoAPI StatusView: Add locality indicator.
See merge request pleroma/pleroma!920
2019-03-11 13:26:12 +00:00
4811eefa6e
MastoAPI StatusView: Add locality indicator.
2019-03-11 13:48:27 +01:00
6038c8a753
Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec
2019-03-11 09:02:03 +03:00
735f40047a
Merge branch 'delete-status' into 'develop'
...
Allow an admin to delete a user status #721 (MastoAPI)
See merge request pleroma/pleroma!914
2019-03-08 22:47:41 +00:00
130fc9eae6
Merge branch 'fetch-posts-on-first-federation' into 'develop'
...
Fetch user's outbox posts on first federation with that user
Closes #131
See merge request pleroma/pleroma!907
2019-03-08 22:33:31 +00:00
2827dfea50
Allow an admin to delete a user status
2019-03-08 20:21:56 +03:00
b775fded10
Add tests for fetch_ordered_collection
2019-03-08 16:28:40 +03:00
3c5926fe91
tests: add regression test
2019-03-07 12:20:04 +00:00
992145e64c
Merge branch 'bugfix/delete-activity-audience' into 'develop'
...
expand the audience of delete activities to all recipients of the deleted object
Closes #682
See merge request pleroma/pleroma!891
2019-03-07 11:31:08 +00:00
7342b5a45f
Preserve parameters in link headers (Mastodon API)
2019-03-07 09:12:16 +03:00
0fe715f3ba
Merge branch 'chore/merge-search-into-list-users' into 'develop'
...
Merge search endpoint into /users
See merge request pleroma/pleroma!898
2019-03-06 22:27:42 +00:00
07f8c79a69
Merge branch 'bugfix/rel-me_list' into 'develop'
...
Web.RelMe: Fix having other values in rel attr
See merge request pleroma/pleroma!901
2019-03-06 13:20:51 +00:00
bc7570c282
[ #647 ] tests for web push
2019-03-06 13:20:12 +00:00
96901b6554
Merge branch 'fix/escape-reserved-chars-in-filenames' into 'develop'
...
Properly escape reserved URI charachters in upload urls
Closes #700
See merge request pleroma/pleroma!905
2019-03-06 01:45:17 +00:00
28d5b40d0a
Add handling of objects not in database
2019-03-05 23:15:22 +01:00
40ff8f5964
Add tests for reserved char escaping in upload
2019-03-05 19:28:58 +03:00
bcd8ef65e0
Merge branch 'add-admin-to-node-info' into 'develop'
...
Include admins in nodeinfo
Closes #689
See merge request pleroma/pleroma!899
2019-03-05 07:05:44 +00:00
788a354ce0
Web.RelMe: Fix having other values in rel attr
...
One example of this is Github which puts a rel="nofollow me" on the
profile link.
2019-03-05 02:13:22 +01:00
d1de0a30cc
Include admins in nodeinfo
2019-03-05 03:17:24 +03:00
e34710b988
Format & update docs
2019-03-04 21:33:53 +03:00
9f3cb38012
helpers: use AutoLinker to validate URIs as well as the other tests
2019-03-04 18:31:49 +00:00
d7a278a733
tests: add tests for rich media helper functions
2019-03-04 18:31:49 +00:00
d45dbdce5a
Merge branch 'feature/add-status-text-to-notifications' into 'develop'
...
Add status text to notifications (mentions and reposts)
Closes #696
See merge request pleroma/pleroma!897
2019-03-04 18:29:13 +00:00
f620199836
Merge search endpoint into /users
2019-03-04 21:26:32 +03:00
cc7b35e097
Add status text to notifications (mentions and reposts)
2019-03-04 20:47:34 +03:00
ca5d894e68
Merge branch 'fix/like-adressing' into 'develop'
...
Stop adresssing like activities to actor's follower collection on non-public posts
See merge request pleroma/pleroma!896
2019-03-04 15:59:57 +00:00
33c614bce0
Stop adresssing like activities to actor's follower collection on non-public posts
2019-03-04 18:09:58 +03:00
aab86698a5
Expand "to" of delete activities
2019-03-04 11:18:45 +01:00
86e4b48a5e
Fix DM visibility for blocking users
2019-03-04 06:24:27 +03:00
ace4231628
Merge branch 'features/bio_rel_me' into 'develop'
...
Add rel=me to the User bio
Closes #423
See merge request pleroma/pleroma!813
2019-03-03 16:00:49 +00:00
6c6a2dbfdd
Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
...
Add pagination and search to users
See merge request pleroma/pleroma!873
2019-03-03 15:59:15 +00:00
b531e366df
Merge branch 'get-follow-requests-sql' into 'develop'
...
Use sql query in User.get_follow_requests/1 for filtering logic
See merge request pleroma/pleroma!883
2019-03-03 15:51:32 +00:00
Egor Kislitsyn
kaniini
rinpatch
Maksim Pechnikov
Haelwenn (lanodan) Monnier
Maxim Filippov
Roman Chvanikov
Hakaba Hitoyo
Ekaterina Vaartis
Steven Fuchs
eugenijm
lain
D Anzorge
Ivan Tashkinov
Haelwenn
feld
Alex S
Mark Felder
Sadposter
kPherox
Sergey Suprunenko
Sachin Joshi
Mike Verdone
RX14
Ivan Tashkinov
kaniini
William Pitcock
Roman Chvanikov
Roman Chvanikov
Aaron Tinio
Francis Dinh
AkiraFukushima
Roger Braun
cascode
link0ff
optikfluffel
Fong-Wan Chau
Karen Konou
lambda